> >This is what I do: before I start coding, I always get the latest CVS
> >tree. I then do cp -R freemware freemware-old, and edit the freemware t=
> ree.
> >Then, diff -Nur freemware-old freemware only gives the "real" changes.
> But if CVS tree changes while you are coding you make diffs against old
> CVS states. You have to be _very fast_ or hope that CVS doesn't change.
No, even if CVS changes this gives the correct result. You want to
have a diff that contains *the changes you made*. You get this diff
only by diff'ing your modified version against the version you started
to modify.
If CVS changed in the meantime, either parts independent of your changes
were modified, in which case your diff is still valid. Or else, there
were conflicting changes, in which case you need to think about it anyway.
In that case, the best thing would be to create the diff as mentioned
above, then delete your working dir, update the CVS tree, copy it over
to your working dir again, apply your patch to the working copy,
manually resolve all merge conflicts, and regenerate a diff between
your two directories.
A diff between the current CVS and your working dir is typically not
useful, however, as that diff will probably just back out the changes
made to CVS in the meantime, which is *not* what you want :-/
Bye,
Ulrich
--
Ulrich Weigand,
IMMD 1, Universitaet Erlangen-Nuernberg,
Martensstr. 3, D-91058 Erlangen, Phone: +49 9131 85-27688
