Reverse Merge not working

19 views
Skip to first unread message

Tobias Knauss

unread,
Mar 28, 2018, 4:28:44 AM3/28/18
to torto...@googlegroups.com
TortoiseSVN 1.9.7, Build 27920 - 64 Bit -dev, 2017/08/19 09:24:24

I want to revert changes from a specific revision by using the reverse merge as described in "Use the merge dialog" in https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-howto-rollback.html
The revision is part of the direct parent branch, so the "merge from" URL is the same as the current working copy source.

It does not work. Nothing happens:



When using the method "Use the revision log dialog" from the same document, it works really well:


What am I doing wrong?

Tobias


Auto Generated Inline Image 1
Auto Generated Inline Image 2
Auto Generated Inline Image 3

Tobias Knauss

unread,
Mar 28, 2018, 4:37:01 AM3/28/18
to TortoiseSVN
I just tried reverse merging the revision to a different working copy (WC url is NOT the merge source URL). This works fine. So it must be a bug in reverse merging on the same URL.

Stefan

unread,
Mar 31, 2018, 3:41:46 AM3/31/18
to TortoiseSVN
If you look at the first line in the progress dialog (the one showing output of the merge), you can see that the one that doesn't work for you shows "respecting ancestry" at the end, the one that works has "ignoring ancestry".
So, since you're merging from the same url you have to check the box "ignore ancestry" in the merge dialog as well.
The log dialog does this automatically since merging there is always from the same url.

Reply all
Reply to author
Forward
0 new messages