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

[TSVN] More Bug Reports

From: Josha Foust <jfoust_at_mankowindows.com>
Date: 2004-12-09 16:06:26 CET

When I use TortoiseMerge to do a 3-way merge I am having some problems.

First, I'm not getting any vertical scroll bars on any of the 3 panels. I
have to use the arrow keys, the mouse scroll wheel or the next and previous
buttons to navigate.

On a conflict line, in the "Theirs" pane, if I right click the first option
I get is "Use this text block". In the "Yours" pane, I get "Use text block
from "theirs"". Obviously it should say something different there.

I was messing around with the "Use text block from "theirs" before "yours""
in the merge and such and it seems to have broken the previous and next
conflict buttons to get to that line.

The other thing is that the "Resolve conflicted subversion status on save"
option doesn't seem to work for me. I resolved all the conflicts and saved
the file, but I still have to set it resolved myself.

Another really minor thing is that when I do an update and there is a
conflict, the last two lines that it prints about there being a conflict
don't seem to cause the scroll bar to move all the way to the bottom.

That should be my entire list.

So as not to sound so negative, I love Subversion and TortoiseSVN. I was
(forced into) using Visual Source Safe previously and subversion is SO much
nicer to work with. Especially with TortoiseSVN as a front end. Thanks for
all your hard work.

Josha Foust

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Dec 10 04:57:21 2004

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.