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

Merge - Stop on copy/rename

From: Ellingsworth, David <David.Ellingsworth_at_davey.com>
Date: Wed, 21 Sep 2016 14:31:40 +0000

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].
Received on 2016-09-21 16:55:26 CEST

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