[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: Ben Reser <ben_at_reser.org>
Date: Tue, 15 Jan 2013 14:29:55 -0800

I've opened the issue #4292 on this.

Note that resolving that problem won't help your particular case
because it'd also mean that D1/D2's creation would be attempted by the
merge and then you'd receive a different tree conflict on that.

Ultimately a fully better user experience with this would require tree
conflict resolution handling. In this case being able to say "give me
the union of the trees and the union of the properties on the
directories of the trees," would be helpful to you.
Received on 2013-01-15 23:30:35 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.