RE: TortoiseMerge

I'm not sure you understand me.

File A lines in scroll window | File B lines in scroll window
File A line1 | File B line 1
File A line2 | File B line 2
File A line 3 | File B line 3
File A line 4: I am same | File B line 4: I am different
File A line 5 | File B line 5

Besides the obvious vertical scrolling, there is horizontal scrolling for each file.
Depending on where the changes are in each line, I may not be able to see the differences.
Thus, I am proposing the following addition, perhaps above the window where the merged file is shown:

Selected Line:
FileA: line 4: I am same
FileB: line 4: I am different

Once you see the lines above each other, when they are both left justified, then you can more easily see the differences between them.
This comparison is shown, even if there is no line on one side.
There is a cursor above which highlights one line at a time, even if it is part of a conflicting section of multiple lines.

This is the approach taken in Beyond Compare, which is what I use as my default diff tool.
That tool also allows you to readjust alignment, and to edit either line from File A or File B.
Editing anything but the merged file doesn't make sense in this case - but that also might be a nice addition.

Chuck
________________________________________
From: Stefan Küng [tortoisesvn@gmail.com]
Sent: Thursday, October 04, 2007 3:15 PM
To: users@tortoisesvn.tigris.org
Subject: Re: TortoiseMerge

Doucette, Charles wrote:
> May I make one small request for TortoiseMerge.
> It is hard to see the compare the two conflicting lines side to side.
> It would be nice to reserve two lines in the display (perhaps in the
> middle) to show the two conflicting lines over each other.

A conflict can't happen with only two lines. It always requires three
lines. And that's the problem: how to show those three lines so the user
can see which of the three lines corresponds to which file.

Stefan

--
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org