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

Re: Surprising behavior with 1.10 tree conflict resolver

From: Stefan Sperling <stsp_at_apache.org>
Date: Tue, 19 Jun 2018 15:40:55 +0200

On Thu, Apr 26, 2018 at 12:11:46PM +0200, Stefan Sperling wrote:
> On Thu, Apr 26, 2018 at 06:44:25AM +0000, Chris wrote:
> > Hi again,
> >
> > I'm attaching a script that reproduces the behavior of checking revisions before the branch was created as well as going back to the revision before the file was created on trunk.
>
> Thank you Chris!
>
> I have filed https://issues.apache.org/jira/browse/SVN-4740

I have finally found some time to look into this.

The fix turned out not to be difficult - the problem was a hard-coded
'revision 0' function paramter which could be replaced with a youngest
common ancestor revision instead. History traversal now stops there.

The fix has been nominated for 1.10.1. Barring unexpected problems
it should become part of that release.

Thanks again for your script! It helped me a lot.
Received on 2018-06-19 15:41:09 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.