Re: [TSVN] Question about issue 35

Molle Bestefich wrote:

> Ah, ok.
> Come to think of it, that's what I tested too.
> Never realized that there was an item missing in the menu though!
>
> I've updated the issue in the tracker with a comment, which I'll
> copy/paste here for archival purposes. Mr. Nájera, you might also
> want to check that my wording is now correct.
>
> Steve, if you want, I can modify the original issue text in the
> tracker instead af just adding a comment.
>
> Copy/waste follows.
> ==========
> Hmm, I'll clarify a bit.
>
> Steps I took to reproduce:
>
> - Revert a file from rev HEAD to eg. rev 40.
> - Modify the file.
> - Try and update the file.
>
> The file will come out in a conflicted state.
>
> Double-clicking the conflicted file entry will bring up a 3-pane
> conflict editor. This function ("edit conflict"?) is missing in the
> right-click menu. The menu does have a "compare with working copy"
> entry, which is not the same.

Well, that's not quite true anymore. I've added the menu entry "edit
conflicts" and "show log" in the last commits.
But what's still wrong:
doubleclicking on a conflicted entry does "edit conflicts", but the
default context menu entry still would be "show diff".

So that's the only thing which needs changing now.

> Also, I've never understood the phrasing "compare with working copy".
> What else would I compare with, if not the copy I'm currently working
> on? Wouldn't it be more informative to tell me what we're going to be
> comparing it with?

You could compare with HEAD, compare with BASE or ask for a specific
revision and compare with that revision then. So I think it really
should stay "compare with working copy".

Stefan

-- 
        ___
   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