Re: Comparison of two repositories?

[Mark D. Baushke]

Lemke, Michael  IZ/HZA-IE5 <address@hidden> writes:

> address@hidden writes:
> > Mark D. Baushke writes:
> > > 
> > > The '-x CVS' option tells GNU diff to
> > > exclude any CVS directories from the
> > > comparison.
> > > 
> > > If you have lots of RCS keywords turned on,
> > > then you may wish to write a quick script
> > > that goes thru your diff output an elides
> > > any hunks that only contain differences in
> > > RCS keyword expansions.
> > 
> > Or use the GNU diff -I option to ignore those
> > lines in the first place.
> 
> Is there a way to have them ignored as well in a
> regular cvs update -j ... -j ... operation?

Ignored? Not entirely. The closest you can come is
to add the -kk flag to the command:

   cvs update -kk -j... -j...

After you have resolved your conflicts, use 

   cvs update -kkv

to restore the default values for your keywords.

        Good luck,
        -- Mark