Rob Murray wrote:
> This sounds a bit complicated. Cvs is your friend. You should run cvs
> update before cvs dif, and resolve any conflicts. This way, your diff
> is against the most recent version.
Yes, I know ;-) I still prefer to have two complete trees, so as to
be able to check the original version or run diffs without being online,
and because it makes it easier to revert to the standard tree: Once
have started modifying a CVS tree and merging has occured, those
changes tend to stick around and it is easy to forget that you no
longer have a tree identical to the CVS version ...
Of course, it is perfectly possible to work that way as well; it's just
a matter of personal preference IMO.
Bye,
Ulrich
--
Ulrich Weigand,
IMMD 1, Universitaet Erlangen-Nuernberg,
Martensstr. 3, D-91058 Erlangen, Phone: +49 9131 85-27688
