[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-12 11:22:27 CET

Josha Foust wrote:

>>>I was messing around with the "Use text block from "theirs" before
>>>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.
> How is that different from the first two context menu choices which don't
> cause the "next conflict" button to skip over the lines when applied?

That depends on which view has the focus. If the bottom view has the
focus, then the "next conflict" will skip over the lines. That's because
the conflict really is marked as not conflicted anymore. But when the
focus is on either the left or right view, those lines still have the
'conflicted' state to enable the context menus (you might change your
mind about which lines to use, so the menu has still to be there).

When you use "use yours before theirs", i.e. use both blocks, then the
conflicted state must be removed from the left and right view too to
disable the context menu - or you'll get very nasty effects when you use
that menu a second time.


   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 Sun Dec 12 11:23:34 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.