(1.10) No longer possible to continue merge after conflict?

[Erik Levin]

Use case in 1.9:

1. TortoiseSVN -> Merge, Merge a range of revisions. Let's say I want to merge revision 10, 14, 18 from branch A to branch B.
   
2. Revision 10 causes a conflict. The old merge resolution dialog would pop up with several options.
3. I choose an option that resolves the conflict e.g. "Resolve using theirs".
4. The conflict is resolved and the merge continues with revision 14, and so on.

In 1.10 instead the following happens:

1. TortoiseSVN -> Merge, Merge a range of revisions. Let's say I want to merge revision 10, 14, 18 from branch A to branch B.
   
2. Revision 10 causes a conflict. The new merge resolution dialog would pop up with several options.
3. The merge is immediately aborted with the message "resolve all conflicts and rerun the merge to apply the remaining unmerged revisions" as the dialog opens.
4. I choose an option that resolves the conflict e.g. "Reject conflicts", or Edit -> Mark as resolved.
5. No matter what, the merge is already aborted and to continue, I have to go back and rerun the whole command again.

Is there a setting available somewhere to get back to the 1.9 behaviour where I could continue a multi-revision merge with conflicts, resolving conflicts as I go?

This is a somewhat big snag in my workflow, working with fairly complicated code bases and branches, and redoing the whole merge command multiple times is time consuming for me...

[Stefan]

Sorry, but that change was done in the svn library: it doesn't allow to continue a merge anymore.

[Erik Levin]

I see, that's very unfortunate. Thank you for the answer, Stefan.

[cise...@gmail.com]

On Wednesday, May 2, 2018 at 1:37:23 PM UTC-4, Stefan wrote:
> Sorry, but that change was done in the svn library: it doesn't allow to continue a merge anymore.

Any possibility to have TortoiseSVN automate the process of rerunning the same merge command after resolving a conflict? Not unlike what it does for the "you need to update before committing" workflow (closes the commit window, runs an update, pops up commit again with message & files selected).

Thanks for your time!

[Alex Haley]

I would second this request.

--
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 tortoisesvn...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/784ecfd4-8e14-4595-991b-9788c8d04a7b%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

--

Alex Haley

Computer Scientist M-AT Platform, System Technology Division

Medical Information Technology, Inc.

Office: 781-774-5156 | Mobile: 508-713-2499

aha...@meditech.com

MEDITECH Circle, Westwood, MA 02090

Main: 781-821-3000 | Fax: 781-821-2199

                 

Subscribe to receive emails from MEDITECH or to change email preferences.

[Anonymous]

I would also request this functionality be changed back to the way that 1.9 worked. Being forced to re-run the merge is a big usability concern because it drastically slows down the process and also causes the log messages to be separate. This may cause the merger to forget to grab the full message, and it also makes the first line of the default message look like the merger grabbed only some of the required revisions.

[pieterjan....@gmail.com]

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

[mhol...@gmail.com]

> that change was done in the svn library
> it doesn't allow to continue a merge anymore.

Seriously, WTF?

[Lukasz]

W dniu środa, 2 maja 2018 19:37:23 UTC+2 użytkownik Stefan napisał:
> Sorry, but that change was done in the svn library: it doesn't allow to continue a merge anymore.

It is still not fixed...
I can't use TortoiseSVN in a newer version than 1.9.7 because merging multi commits from trunk to branch takes much more time.

[bvoske...@gmail.com]

Also very disappointed by the merge behavior in 1.10. Thought something was wrong with my configuration because it's much less usable now. I understand this is a Subversion change not really a TortoiseSVN change. Just want to go on record with these fine folks here and say I also see this as a step backwards in the merge process.

I'll be downgrading to 1.9 to wait out the storm. Please consider ways to get us back to a more automated merge, resolving conflicts in one go at the end.

[Nathan Hartman]

I am thinking that the merging UI/UX should be decoupled from the Subversion back-end -- a sort of "multi-step merge" process.

[Łukasz]

How Can I do fast merge few commits from trunk to branches\StableX ?

Is there a chance to restore this possibility?

Where should I report it if not here?

W dniu środa, 2 maja 2018 19:37:23 UTC+2 użytkownik Stefan napisał:

[Łukasz]

In version 1.12, it started working again

[ela....@gmail.com]

20-05-2019 08:56:51 UTC+2 Łukasz wrote:
> In version 1.12, it started working again

No it didn't.
https://i.imgur.com/cTrvS7I.png

[alex.dr...@gmail.com]

@Stefan do u think that in the next releases it will be back again the option to continue the merge after resolve conflicts?

[André Ziegler]

What is the status for TortoiseSVN 1.14? Does it still has the issue? I still hang at 1.9 for this reason.

[André Ziegler]

ok, I can answer it on my own, it works with 1.14, here I can continue after a conflict , so I've updated now from 1.9 to 1.14