Merge all revisions from trunk to branch

Hello,

I have a problem with TortoiseSVN version 1.9.5, maybe it is just my lack of understanding.

I am working in a branch of a repository. There I commit some changes, e.g. Revision 10.
Then I merge this revision into the trunk, which creates revision 11.

After that, another user commits something into the trunk, creating revision 12.
Now I want to merge this revision back into my branch.

So I use the option "Merge" -> "Merge a range of revisions". I select the trunk URL, but because I am lazy, I leave the "specific range" box empty and click Next -> Merge.

Now I get some tree conflicts, because Tortoise SVN tries to merge the revision 11 too - which originally comes from my branch.
Why does this happen?

This gets even worse when I am using Externals. In my situation, I am using branches of externals. After the "Merge all", they are getting changed to the trunk of the external - although I am still working in a branch.

Best regards,
Daniel Petat

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3196280

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-07 12:14:31 CET