> I was wondering if there is a way in CVS
> to tell it to kill my local copy of a file
> if there is a problem with merge? I didn't
> change or patch these files, but every once
> and a while something like this happens:
>
> -------------------------------------------------
> P src/backend/parser/analyze.c
> RCS file: /usr/local/cvsroot/pgsql/src/backend/parser/gram.c,v
> retrieving revision 2.71
> retrieving revision 2.73
> Merging differences between 2.71 and 2.73 into gram.c
> rcsmerge: warning: conflicts during merge
> cvs server: conflicts found in src/backend/parser/gram.c
> C src/backend/parser/gram.c
> ----------------------------------------------------------------
>
> any suggestions woudl be way cool.
>
> Thank you
> ClarkEvans
> clark.evans@manhattanproject.com
>
>
Just delete the file and re-update. I use this to remove changes I have
made to my local copy:
:
[ ! -d pgsql ] && echo "You must be at the CVS top of the pgsql tree" 1>&2 && exit 1
pn pgcvs -qn update pgsql | grep '^M ' | cut -d' ' -f2 | xargs rm
pgupdate
Basically, it removes files with M, and reupdates.
-- Bruce Momjian | http://www.op.net/~candle maillist@candle.pha.pa.us | (610)
853-3000+ If your life is a hard drive, | 830 Blythe Avenue + Christ can be your backup. | Drexel Hill,
Pennsylvania19026