>>You can use the keyword $Revision$ as explained in cederqvist (�12).
>>Though I've read unhappy comments about this feature in this list.
>
>I don't remember many unhappy comments about $Rev$ or its cousins $Id$ and

>$Name$. There are many reasons to avoid $Log$, though.
>
>Fred
>
You get conflicts when merging a branch to the main trunk when you update
without option -kk at every changed $Rev$ (or $Id$/$Header$).
But when you use option -kk recursively, your binary files in the
repository are broken.
I changed my copy of cvs, that it doesn't overwrite the -kb expansion mode,
i.e. when using "update -kk" the keywords in binary files remain unchanged.

I made a few tests and it works fine for me at the moment.
Are there any reasons to overwrite the -kb expansion mode?

Susanne


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to