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

Re: Subversion merge creates bogus tree conflicts

From: David Moon <david.moon_at_versata.com>
Date: Tue, 15 Jan 2013 13:32:58 -0500

On Jan 15, 2013, at 1:30 PM, Julian Foad wrote:

>> Hmm, I wonder if the directory not existing on the target means
>> this is actually
>> a simple bug, not really some complicated problem with merging.
>> Why wasn't
>> the parent directory of a file being added created automatically,
>> as if svn
>> merge took a --parent argument? When would that be harmful?
> It's very complex -- in general (different merge scenarios) the
> delete might have been a conscious user action committed in the
> target branch, and might be a move away rather than a plain delete,
> since svn still lacks move tracking. We can't assume that just
> recreating the dir is the right thing, although it should be
> offered as an option in the conflict resolver.

I assumed, perhaps incorrectly, that svn knew the difference between
something being deleted and something never having existed. In other
words, if the directory had existed and then been deleted or moved,
the list of changes being merged would have included a delete. But
if the directory never existed before it would not be mentioned in
the list of changes being merged.

Just trying to be clear and unambiguous.

--Dave Moon
Received on 2013-01-15 19:40:24 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.