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

Re: Tree conflict bug?

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Mon, 03 Nov 2008 03:30:48 +0100

Stefan Sperling wrote:
> See
> http://subversion.tigris.org/svn_1.5_releasenotes.html#copy-move-improvements
>> So getting the local mods in there is more like, say, an accident, right? Is
>> this always safe? Is it checked to be?
> Retaining the local mods is the goal of this feature.

Ah. :)

So this should actually auto-resolve a tree-conflict, somehow. In the nature
of tree-conflicts, there must first be some blocking though, letting the
change happen once the user acknowledges it. Ok, we know that by now. ;)

$ svn up
   C(D->M) file
A file_moved_here
### the local mods should not yet be in file_moved_here at this point!
$ svn ci
$ svn resolve --theirs-but-my-mods file <-- ick.
D file
M file_moved_here

Or something.

$ svn resolve --move file --to file_moved_here <-- also ick.
$ svn resolve --move file <-- needs copy-to info?

BTW, still just trying to understand it...


Received on 2008-11-03 03:31:17 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.