Nick_Gianakas@sybari.com wrote:
>>The third pane (bottom view) is only visible if you resolve a conflict.
>>Or if you open three files to compare, not just two.
>
> So if I have a file in SVN. I modify my working copy, then diff it
> against the base. It shows the diffs, but no options in the third pane.
> Are you saying it only works if I diff against 2 local copies or 3-way?
If you diff a file against its base, then you don't have a conflict. So
it's just a two way diff.
Three way diffs are used in the following scenario:
user A modifies file
user B modifies file too
user A commits file
user B updates file and gets a conflict, because user A modified the
same lines in file as the user B.
Subversion then creates three files:
file.yours (the modified file of user B)
file.theirs (the modified file of user A)
file.base (the unmodified file, the "base" both user A and B started
modifying from).
If you now diff those three files, you'll have your three way diff.
> No, I've never seen GNU diff's source. But if it's anything like some
> other GNU programs I've seen, I understand completely.
> Meld is the only program I've used to pinpoint differences within a line.
> It's also the most usable diff/merge utility I've used. Although I think
> there are still some things it lacks or can improve.
There always are things to improve ;)
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 21:23:45 2004