Nick_Gianakas@sybari.com wrote:
>>Sure you can keep both changes. In the bottom view, you can select
>>"yours before theirs" and "theirs before yours" as well as yours and
>>theirs alone. (On conflicted lines only, of course).
>
> I must be missing something. Where is the bottom view? I see a small
> pane on the bottom
> (~2 rows) but I don't see anything in it. I click on the change, cursor
> to the next one, but I don't
> see anything. The manual doesn't say anything about what you describe.
The third pane (bottom view) is only visible if you resolve a conflict.
Or if you open three files to compare, not just two.
You see, _that's_ the feature most diff programs miss: the three way
diff. And a three way diff is necessary to resolve conflicts.
>>The Subversion diff library doesn't allow a diff inside a line. It has
>>the diff chunks hardcoded to newlines.
>
> Meld can do this regardless if the files are from CVS, Subversion, or not
> version controlled at all. I suspect is uses GNU diff to determine the
> particular differences after CVS or Subversion give it the line (ie. a
> 2-step process).
I know that GNU diff can do that. But I really don't wanna use GNU diff.
Have you looked at the sourcecode of it? If you can go through that code
without getting headaches and the urge to vomit you can use it - I couldn't.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 20:11:06 2004