Re: [HACKERS] CVS overwrite on merge fail?

From: Bruce Momjian <maillist(at)candle(dot)pha(dot)pa(dot)us>
To: clark(dot)evans(at)manhattanproject(dot)com (Clark Evans)
Cc: hackers(at)postgreSQL(dot)org
Subject: Re: [HACKERS] CVS overwrite on merge fail?
Date: 1999-02-18 19:50:39
Message-ID: 199902181950.OAA03364@candle.pha.pa.us
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

> 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(dot)evans(at)manhattanproject(dot)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(at)candle(dot)pha(dot)pa(dot)us | (610) 853-3000
+ If your life is a hard drive, | 830 Blythe Avenue
+ Christ can be your backup. | Drexel Hill, Pennsylvania 19026

In response to

Browse pgsql-hackers by date

  From Date Subject
Next Message Clark Evans 1999-02-18 20:07:50 6.4 Build Error from CVS snapshot
Previous Message Egon Schmid 1999-02-18 19:36:13 Re: [HACKERS] CVS overwrite on merge fail?