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

Re: [TSVN] More Bug Reports

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-12-10 22:20:16 CET

Josha Foust wrote:
> 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.

Usually, a slight resize of the window will bring the scrollbars back.
But I finally fixed that in revision 2097 (I hope it's fixed ;))

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

Reported by Simon before, and already fixed ;)

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

If you click on either of those context menus, the conflict is gone!
Think about it: you resolve that conflict by choosing which of the
conflicting lines you want to use. That's why the "next conflict"
doesn't stop there anymore.

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

Fixed in revision 2095.

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

I could fix that, but that would mean a whole lot more calculations when
scrolling, and that again would mean scrolling will be slower. That's
why I didn't 'fix' that before.


   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 Fri Dec 10 22:21:17 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.