Re: Re[2]: [TSVN] Question about issue 35

>> Well, if it is, then you can close the issue ;)
>
> I haven't checked in the latest versions, but for example on a
> conflicted file, popup menu does NOT show "edit conflict" but only
> "diff files". If you double-click you'll get edit conflict. That was
> what I mean.

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.

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?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 25 22:02:23 2005