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

Re: Merge - Stop on copy/rename

From: Stefan Hett <stefan_at_egosoft.com>
Date: Thu, 22 Sep 2016 13:20:11 +0200

On 9/21/2016 4:31 PM, Ellingsworth, David wrote:
> I have a repository that resembles the following structure:
>
> /trunk
> /branches/A
>
> r1 - r9 are committed to /trunk
> /branches/A is created from /trunk_at_r1 and recorded as r10.
>
> When attempting to merge /trunk into /branches/A, the "Stop on copy/rename" option hides r2 - r9 from /trunk. Unchecking "Stopy on copy/rename" shows r1 - r9.
> I would expect "Stop on copy/rename" to stop at r1, and not r10 since r10 is a copy of r1 and does not include any modifications since then.
>
> Regards,
>
> David Ellingsworth
> Software Developer
> The Davey Tree Expert Company
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3186592
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>
Try the 1.9.4/5 nightly - it might have been fixed there already:
https://nightlybuilds.tortoisesvn.net/1.9.x/x64/full/

-- 
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3186699
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-09-22 13:20:27 CEST

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