I would also very much like this to be automated / possible again. I just spent 2 hours doing a merge with TSVN 1.10 that would take 20 minutes with TSVN 1.9.
Just like others mentioned, the use case is maintaining an (old) stable branch by cherry-picking revisions to merge back. Each of those revisions causes a conflict in the same file (some kind of changelog-like file, which is edited differently on trunk vs release brances). Due to the cherry-picking, this merge is broken up in 100+ separate ranges. Behaviour in TSVN 1.9: * Spend about 10 minutes finding the list of revisions to merge * Start the merge * with every merge range: resolve the conflict on the "changelog" file use "keep mine" * at the end, edit the changelog file manually * commit Behaviour in TSVN 1.10: * Spend about 10 minutes finding the list of revisions to merge * Start the merge * Resolve the conflict on the "changelog" file using "reject incoming changes" * Close the merge window * Start the merge again (5 - 6 mouse clicks + copy/paste the revision range) * Resolve the conflict on the "changelog" file using "reject incoming changes" * Close the merge window * Start the merge again (5 - 6 mouse clicks + copy/paste the revision range) * ... * (repeat those steps many many times) *... * Edit the changelog file manually * Commit Additionally, during each restart of the merge, TSVN will warn me about modifications to the working copy I'm using to merge. Which is good in normal situations, but with this forced manual merge restart, it's distracting/confusing/... Based on you earlier comments, I understand this is due to a change in the SVN library. However, could you please atleast make it easier to do with less mouse-clicks? Maybe an option when starting the merge that says "automatically restart after conflicts". Or add a button on the "finished" screen that automatically restarts the same merge (next to the "close" button). Kind regards, Pieter-Jan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/14ad4dc9-6269-49c0-aaa1-a7def42ec9a1%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
