Merge - Stop on copy/rename

[Ellingsworth, David]

I have a repository that resembles the following structure:

/trunk
/branches/A

r1 - r9 are committed to /trunk
/branches/A is created from /trunk@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-un...@tortoisesvn.tigris.org].

[Stefan Hett]

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