On 11 February 2011 07:53, David Kelley <
dskelley gmail com> wrote:
> I agree with you on your general philosophy for VCSes, but the comparison to
> git-gui is a bit of a stretch for me. Git-gui shows changes in unified diff
> format. This means a deletion is shown as it's own line. It also means if
> you have a block of changed lines it will be shown separately as a few lines
> removed, plus a few lines added. This is functionally different from meld's
> display which shows lines modified side by side. Consider that you have 5
> lines modified to 10 lines between your two files. Now you want to keep the
> original 5 lines, plus your 1 line fix, discarding 4 lines, which might be
> debug prints or something. In git-gui you could click the one line you want
> and select stage for commit. How would this work in meld? You would hold
> down your modifier key, which would cause the first block to show 10 lines,
> 10 arrows, and the second block to show what? Also 10 lines with 5 blank? If
> only 5 lines, at which point in the opposing block do you insert the new
> line if you select a single line to merge? Above? Below? Somewhere in the
> middle? Even if you do expand to show blank lines changes are they won't
> really align where you want them to all the time, and in that case you'll be
> back to copy/paste like you have to now.
