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

Re: Inconsistent merge on subdirectory behavior?

From: Stefan Sperling <stsp_at_apache.org>
Date: Sun, 15 Apr 2018 16:10:34 +0200

On Sun, Apr 15, 2018 at 12:49:49PM +0000, Chris wrote:
> Hi Johan and thanks for the reply.
>
> I made a very simple reproduction script and attached it to this mail, the behavior seems to be easy to reproduce. Haven't made a reproducton script before so I'm not sure how you want the issue to be explained, but I first did the behavior that I think is incorrect and did a status+echo and then the same from a subdirectory with a second status+echo.
>
> If you instead wanted me to make a bug report on the tracker, let me know.
>
> /Chris

Thank you very much for writing and providing this script.

I agree that this problem looks like a bug. If you have time to
do so, please file an issue in our issue tracker.

The problem also affects 'svn diff'.
A reasonable expectation would be that the reverse of a diff which
adds something is a diff which deletes something, but in this case
the reverse diff produced by SVN is an empty diff:

$ svn diff -c2 ^/trunk/A
Index: foo
===================================================================
$ svn diff -c2 A
Index: A/foo
===================================================================
$ svn diff -c-2 A
$ svn diff -c2 ^/trunk/A
Index: foo
===================================================================
$ svn diff -c-2 ^/trunk/A
$
Received on 2018-04-15 16:11:10 CEST

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

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