Subversion 1.6 released.

http://subversion.tigris.org/servlets/NewsItemView?newsItemID=2261

by jawngee • 17 years ago

43 26 17 years ago

subversion.tigris.org

>Subversion 1.6 recognizes a new kind of conflict, known as a "tree conflict". Such conflicts manifest at the level of directory structure, rather than file content.

>Situations now flagged as conflicts include deletions of locally modified files, and incoming edits to locally deleted files. Files and directories which are victims of a tree conflict cannot be committed before the conflict is marked resolved.

Wow - finally! This is great. We've had to handle these edge cases during merges (greatly slowing our scripts) for a long time. Hopefully this will give us significant speed improvements which should help with one of the minor irritants of our users.

graywh• 17 years ago

<sarcasm> Hackers were still using svn and not a dvcs? </sarcasm>

hypermatt• 17 years ago

yawn

sgharms• 17 years ago

While many responses are going to be "yawn", especially in the face of the git juggernaut, a great many enterprise systems are locked into svn for the foreseeable future (given economic forecasts, IT departments aren't getting tons of budget for SCM migration / upgrade). Therefore a few extra features coming in are welcome...even if they don't begin with git-

st3fan• 17 years ago

great many enterprise systems - oh please give me a break. Subversion has nothing to do with enterprise blah. Many of us simply use svn because it is a fine tool and gets the job done. For all kinds of projects, from open source to 'enterprise'.

Seriously .. don't put the enterprisey stigma on it. It does not deserve that.

jrockway5• 17 years ago

Subversion... the version control system of choice for people that don't understand version control.

DTrejo• 17 years ago

He did not put the "enterprisey stigma" on it. He only talked about how some enterprises are locked in, and appreciate updates. It appears you misread something.

vinutheraj• 17 years ago

Here's a scenario - there are 2 coders working on basically the same base code, but each doing something different. Now the code from both these guys needs to be merged to the base code periodically, so what do you think these guys should use - git or svn , or any other VCS for that matter ?

visitor4rmindia2• 17 years ago

I suppose any good VCS should work fine. Each dev should get his/her own branch which is periodically merged upstream.

We use SVN and it does the job just fine. In fact, we are still stuck on 1.4 so we track merges ourselves which isn't really a big deal.

jhawk282• 17 years ago

I wonder if the CTypes Python bindings will help out the DVCS clients such as Bazaar or Mercurial. Bazaar already has good client support for SVN. It would be nice if Mercurial would get first class support.

durin42• 17 years ago

Not really. I've looked at the ctypes bindings (I've got a set of incomplete patches to them), and they lack diff and replay support, which makes them basically useless for building a client. Git uses the perl bindings, so I can't speak to the quality of those. Bazaar uses a library called subvertpy that they wrote when they got tired of the suck and pain that is the Python SWIG bindings for Subversion. I'm about to switch to using that for hgsubversion, since fixing up the ctypes bindings has proven to be nothing more than a monumental pain.

jhawk282• 17 years ago

That would be awesome. I prefer using Mercurial to Bazaar, but I really need the subversion client interface.

njoubert• 17 years ago

After updating my svn client on my mac and my ubuntu box to this, eclipse no longer manages to do anything with the team features....

Subversion 1.6 released.

Related Stories