Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: local policy includes SPF record at
 spf.trusted-forwarder.org)
References: <20140603141419.GL18855@ted.stsp.name> 
Message-ID: <1402003545.47102.YahooMailNeo@web87702.mail.ir2.yahoo.com>
Date: Thu, 5 Jun 2014 22:25:45 +0100 (BST)
From: Julian Foad <julianfoad@btopenworld.com>
Reply-To: Julian Foad <julianfoad@btopenworld.com>
Subject: Re: reverse-merge fails to undo replacements
To: Stefan Sperling <stsp@elego.de>
Cc: "dev@subversion.apache.org" <dev@subversion.apache.org>
In-Reply-To: <20140603141419.GL18855@ted.stsp.name>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

Stefan Sperling wrote:=0A> Paths which were replaced are not reverse-merged=
.=0A> Is this intended behaviour or a bug?=0A=0AThe first key fact here is =
those replacements involve no change of content:=0A=0A=A0 $ svn log -r42758=
=0A=A0 r42758 | [...]=0A=A0 Changed paths:=0A=A0=A0=A0=A0 R /trunk/docs/cor=
e/howto/listings/logger (from /branches/log-booyah-6750-4/docs/core/howto/l=
istings/logger:42757)=0A=A0=A0=A0 [...]=0A=0A=A0 $ svn diff -c 42758 ^/trun=
k/docs=0A=A0 [no output]=0A=0AThe second key fact is that the replacement i=
s related to the replaced node. That is, I suppose, the reason that even th=
e "notice ancestry" mode of diff shows no replacement:=0A=0A=A0 $ svn diff =
-c 42758 --notice-ancestry ^/trunk/docs=0A=A0 [no output]=0A=0AI'm not sure=
 exactly what the relationship is, in terms of which was copied from what a=
t what revision -- I haven't checked -- but there's some copied-from relati=
onship there.=0A=0AThe changes that "merge" applies are generally meant to =
be the same =0Achanges that "diff --notice-ancestry" shows. In that respect=
, "merge" is=0Aworking consistently with "diff".=0A=0AAs the merge is behav=
ing like diff, I can't see a bug here unless there is some further inconsis=
tency to be found.=0A=0AI haven't tried the corresponding forward merge, bu=
t I presume it would also do nothing, just like the reverse merge.=0A=0AI a=
dmit it's odd that "log -v" shows a replacement but "diff --notice-ancestry=
" doesn't; but that's a rather different issue.=0A=0A- Julian=0A=0A=0A> svn=
 co svn://svn.twistedmatrix.com/svn/Twisted/trunk@42758 wc=0A> cd wc=0A> =
=0A> $ svn merge -c -42758 .=0A> --- Reverse-merging r42758 into '.':=0A> D=
=A0 =A0 twisted/topfiles/6750.feature=0A> $ svn log -r42758=0A> -----------=
-------------------------------------------------------------=0A> r42758 | =
wsanchez | 2014-06-03 07:25:58 +0200 (Tue, 03 Jun 2014) | 8 lines=0A> Chang=
ed paths:=0A> =A0=A0 R /trunk/docs/core/howto/listings/logger (from =0A> /b=
ranches/log-booyah-6750-4/docs/core/howto/listings/logger:42757)=0A[...]=0A