[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: It's time to fix Subversion Merge

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: Mon, 11 Jul 2011 13:36:28 -0400

On Mon, 2011-07-11 at 12:48 -0400, Mark Phippard wrote:
> 2. Subversion does not handle move/rename well (tree conflicts)
[...]
> When this problem was first approached (before we came up
> with tree conflicts) it hit a brick wall where it seemed a new
> repository design was needed:

It's worth considering that git has a reputation for good merge support
even though it has no commit-time copy/rename history whatsoever in its
history model. By contrast, bzr paid a lot of attention to container
history and merge support in the face of tree reorgs, and it clearly
isn't as much of a killer feature as its designers had expected
(http://www.markshuttleworth.com/archives/123).

So, one possible way forward is to decide that copy history is just a
hint for "svn log" and that merging should ignore it.
Received on 2011-07-11 19:37:07 CEST

This is an archived mail posted to the Subversion Dev mailing list.