Re: reverse-merge fails to undo replacements
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 5 Jun 2014 22:25:45 +0100 (BST)
Stefan Sperling wrote:
The first key fact here is those replacements involve no change of content:
$ svn log -r42758
$ svn diff -c 42758 ^/trunk/docs
The second key fact is that the replacement is related to the replaced node. That is, I suppose, the reason that even the "notice ancestry" mode of diff shows no replacement:
$ svn diff -c 42758 --notice-ancestry ^/trunk/docs
I'm not sure exactly what the relationship is, in terms of which was copied from what at what revision -- I haven't checked -- but there's some copied-from relationship there.
The changes that "merge" applies are generally meant to be the same
As the merge is behaving like diff, I can't see a bug here unless there is some further inconsistency to be found.
I haven't tried the corresponding forward merge, but I presume it would also do nothing, just like the reverse merge.
I admit it's odd that "log -v" shows a replacement but "diff --notice-ancestry" doesn't; but that's a rather different issue.
> svn co svn://svn.twistedmatrix.com/svn/Twisted/trunk_at_42758 wc
This is an archived mail posted to the Subversion Dev mailing list.