[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge Resolve & Save

From: Oto BREZINA <brezina_at_printflow.eu>
Date: Fri, 28 Jun 2013 18:26:38 +0200

On 2013-06-28 17:50, Stefan Küng wrote:
> On Fri, Jun 28, 2013 at 5:41 PM, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
> On 28.06.2013 08:59, Lübbe Onken wrote:
> Hi Folks,
> is it just me who finds the process of resolving conflicts and
> closing
> TortoiseMerge a bit awkward. Maybe I have missed something and
> I'm just
> using the application in an awkward way, but for me
> TortoiseMerge lacks
> a resolve & save or resolve, save & close function.
> When I'm done with editing conflicts, I do these three actions
> to really
> finish.
> 1: Click "Save"
> 2: Click "Resolve"
> 3: Click "Close"
> 1&2 may be reversed.
> I know that TortoiseMerge prompts me for unsaved changes if I just
> close, but does it also offer me the option to mark the
> conflict as
> resoved? I don't know while I'm in TortoiseMerge, so in order
> not to be
> sorry and have to do the merge again, I try to finish
> everything before
> closing.
> It does ask you, yes.
> IIRC, resolving conflicts in TortoiseMerge doesn't interact
> with the
> TortoiseSVN merge dialog, so when I get a conflict during a branch
> merge, I have to makr the conflict as resolved there (again).
> Well, you can do that. But it won't do anything: those conflicted
> files are not in the working copy (yet) so they're temporary. You
> have to click the "Resolved" button in the merge conflict dialog
> to mark those as resolved.
> I haven't merged a branch with 1.8 yet, so maybe that has
> changed, but
> my wish is that resolving a conflict in TortoiseMerge needs as
> few user
> actions as possible. It already feeds back into the SVN update
> dialog,
> but should also feed back into the merge dialog, if possible.
> Isn't the "resolve" button in TortoiseMerge just the last
> touch of a
> conflict resolution?
> Shouldn't it be part of the "file" menu, like "resolve & save" or
> "resolve & save as"?
> In case of conflicted files, could we change the two standard file
> entries to "resolve & save" and "resolve & save as"?
> "Resolve & save" - yes.
> "Resolve & save as" - definitely not: when you "save as" you save
> the file somewhere else, so it's not versioned there and therefore
> can not be marked as conflicted.
> Resolve is not necessary for a standard diff, but for
> conflicted files
> it is mandatory. Maybe it is different for other users, but I
> didn't
> have a conflicted file yet that I did not resolve and save and
> close.
> Either I closed without resolving and saving or I did both,
> but never
> save without resolve or resolve without save.
> I'll change the text of the save menu/button.
> Thinking about this a little more, I think it's not a good idea to
> change the text: it would have to be "Save & mark as resolved" since
> "Save & Resolve" would indicate that it does resolve the conflict
> automatically, but all it can do is to mark the conflict state of the
> file as resolved.
> But how about removing the "Resolve" button completely? It's not
> really necessary since when saving, the save dialog asks whether to
> mark the file as resolved anyway (if the file is actually marked as
> conflicted, so it won't even ask if the file is not versioned and/or
> not marked as conflicted).
Actually I would vote against removing, this button saves a click.
And sometimes I want to only past and save, resolve rest later, i would
have to think about it - I'm in little rush right now.

You can call it "save &mark...", but I would like to see it.

Let me remind that when saving file marked as need resolve Having only
one dialog instead of two (Save?, Mark?) is preffered from my side.
> Stefan
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-28 18:26:49 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.