Dean Do <[EMAIL PROTECTED]> wrote: > I'm currently running CVS 1.10.4 on Solaris. I have a issue with merge in > which the only conflict is the CVS revision. Is there any switch to tell > CVS to ignore diff in revs? Oftentimes, both files on the branch and the > HEAD are already in sync, however, only their CVS revisions are different, > e.g.
> <<<<<<< foobar.c > * $Revision: 1.1.12.5 $ $Date: 2005/05/13 00:51:04 $ > ======= > * $Revision: 1.4 $ $Date: 2005/05/12 23:12:08 $ > >>>>>>> 1.4 Add the "-kk" flag to the command that does the merge. The keywords won't be expanded (e.g. just "$Revision: $") and there won't be a conflict. The "-kk" flag is sticky to the sandbox. Use "cvs update -A" to clear it when you've committed your merge. _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
