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

Re: No Merge Conflict "Mine/Theirs" Context Menu?

From: Terry Rosenbaum <Terry_at_AMICAS.com>
Date: 2006-02-25 00:22:36 CET

Hi Stefan,

The problem is now resolved. Here is what I discovered:

1) Per your suggestion, I checked and found I had the "Ignore leading
whitespace" setting
enabled for Merge. With that setting disabled, the conflict is displayed as
expected and the Next/Previous buttons are enabled as well.

2) I did notice the behavior you described regarding the
selected lines problem. If I select any line other than
the conflict line with the left mouse button and then
right mouse on the conflict line, nothing happens.
The right mouse does not appear to move the
selection once a line is selected with the left mouse
(perhaps it should). This is true in all 3 panes.
And, it really has nothing to do with whether or not
there is something special about a line - it is just how
the mouse selection is working in merge - there
is strange behavior with the left-mouse selection
vs. right-mouse selection.

Thanks for your help.


Stefan Küng wrote:
> Terry Rosenbaum wrote:
>> Using the 1.4.0 nightly from last yesterday, the Next/Previous
>> conflict buttons
>> are grayed out. Merge shows no conflicted lines - only differences.
>> Even though there are conflicting changes...
> Do you have some 'ignore whitespaces' or some other 'ingore' settings
> activated? Maybe that's the reason why you don't see a conflict?

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Feb 25 00:23:12 2006

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.