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

Re: Tortoise Merge: tweaks to help and/or changes to context menu.

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-10-20 14:43:54 CEST

Hugh Gibson wrote:
> Using TortoiseSVN 1.2.4, Build 4479 - 32 Bit on Windows 2000.

Thanks for the reports.

> A. Context menu problems
> ========================
> I had to use Tortoise merge to resolve a conflict in a three-pane view. I
> read the help file first (!). It talked about using right-click and then
> selecting "Use text block from “mine” before “theirs”" etc.
> Try as I might I couldn't find this option. All I could find was "Use this
> text block".
> After some time I realised that I needed to click in the bottom pane to
> get the "mine before theirs" option.
> So, two possibilities:
> 1. Clarify the location to click on. "As in two pane view, you can
> right-click on conflicted lines /in the bottom pane/". Also mention the
> options available when you right-click on either of the files in the top
> area.
> 2. Change the options available in the context menu. It seems to me that
> you could have "Use text block from “mine” before “theirs”" (and vice
> versa) in the context menu for both top-level panes.

Stefan, which option do you prefer? Doc change or behaviour change?

> B. Save after merge?
> ====================
> After using blocks from both sides, I then clicked on "Mark as resolved".
> All good. The resolved file was automatically loaded into my editor (as it
> had been open at the time, prior to merging). Looks good. But when I
> closed Tortoise Merge I was asked:
> ---------------------------
> TortoiseMerge
> ---------------------------
> Do you want to save your changes?
> ---------------------------
> Yes No Cancel
> ---------------------------
> They were already saved...

I will leave that to Stefan.

> C. Mark as resolved
> ===================
> There is no mention in the help about what "Mark as resolved" does, and
> the need to use it when you have finished merging.

OK. On my todo list.

> D. Toolbar help oddities
> ========================
> I note that "Mark as resolved" appears on the toolbar but isn't mentioned
> in the help for the toolbar. Also, the help for the toolbar appears to use
> buttons with text on them, rather than the images which actually appear in
> the toolbar.

Hmm. Maybe we should use a different markup for those. I will add a
picture of the toolbar at the top anyway.

> Under the "Save" button the help says "If you have selected Resolve
> conflicted Subversion status on save in the settings dialog, " but I can't
> see that option in the settings dialog.

You're right. It doesn't appear in the main settings or in TMerge settings.

> E. Settings content broken?
> ===========================
> Under Settings in the content tree there are two blank pages. Selecting
> either of these just loads the Settings page. Was there a sub-heading
> which was removed and the index wasn't rebuilt?

Can't see that on my system. Can you do a screenshot to show what you mean?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Oct 20 14:44:29 2005

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.