Re: [TSVN] Re: TortoiseMerge: Editing conflicts

Nick_Gianakas@sybari.com wrote:

> Good observation; I've never noticed that. Attached to this message are
> two screenshots of my own showing the 3 panes. It's not the best, but you
> get the idea. The second shows quick access to add above/below/both
> (could use the context menu too).

Thanks for the little animation. I always wondered how tools showing the
diffs that way would deal with large parts of empty lines.
But now that I see it: sorry, I don't like that. Too much "movement" of
the screens. I'd like to have my views "static" - it's better for the eyes.

> I'm not affiliated w/ Meld in any way. I suggested it because it seems to
> provide all the features that TSVN list members have mentioned included
> (but certainly not limited to):
> - Direct SVN integration (for diff)
> - Directory view (1, 2, and 3 way diff), direct integration w/ SVN
> - True 3-way merge (base, Theirs/Head, Yours)
> - Inline editing (diff updates on the fly)
> - Detailed difference (highlight the part(s) of each line that are
> different--not just the line)

Can it apply patchfiles too?

> When you are merging two files, they must have a common base. The diff
> view in TMerge shows the conflicting lines between the modified files. It

Wrong. In three-way merge the two top views show the diff between
yours-and-base and theirs-and-base, _not_ between yours-and-theirs.

Stefan

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