>>>>> "Christian" == Christian Andersson <[EMAIL PROTECTED]> writes:
Christian> Hmm diff/merge, one short question, as you might have
Christian> understood Linux/unix and it's tools are not my main
Christian> expertise .-)
Christian> Does not linux come with a diff-tool?
"diff" has been a *standard* utility program on all Unices for decades.
Christian> Is not that difftool used by cvs?
I think CVS handles the trivial cases itself, and delegates the
difficult cases to "diff".
Christian> If so, if you have 2 full versions of the same file on
Christian> the harddisk and run this difftool would not the output
Christian> of that difftool be the same as what cvs will give you?
Other than a few addition lines printed by CVS indicating the revision
numbers being diff'ed, the result is the same.
Christian> in the end, you can still use diff/merge even without
Christian> cvs,
Yes. And we have 'patch' to do the merge. There's also diff3.
Christian> however cvs does this for you, and it keeps the
Christian> files smaller on the harddisc...
More importantly, it knows which diff-result to apply to which
revision. And it handles branching and tagging.
--
Lee Sau Dan ���u��(Big5) ~{@nJX6X~}(HZ)
E-mail: [EMAIL PROTECTED]
Home page: http://www.informatik.uni-freiburg.de/~danlee
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs