[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

'cvs update -C' and loginfo

From: Michael St.Ack
Subject: 'cvs update -C' and loginfo
Date: Mon, 04 Jun 2001 21:37:00 -0700
User-agent: Mozilla/5.0 (X11; U; Linux 2.2.14-5.0 i686; en-US; rv:0.9) Gecko/20010505

'cvs update -C' works differently when called inside loginfo. Maybe some kind soul can point me at why this is so.

Our site makes use of the auto-update mechanism for part of our website as described in the Cederqvist et al manual [].

Our problem is that files get checked in w/o their being based on the immediate ancestor so often there are merge conflicts. Since the auto-exported directory is sitting under a webserver, having files w/ merge conflicts in them is undesirable. I thought I could just add a '-C' to the 'cvs update -d' in our loginfo. The '-C' seemed to work as desired when tried on the command line, but its behavior is otherwise when called inside loginfo.

Here is what I see when I do a 'cvs update -d' (The repository is via pserver):

address@hidden master]$ cvs update -C Footer.wm
(Locally modified Footer.wm moved to .#Footer.wm.1.24)
U Footer.wm

Here is what I see after adding the '-C' flag to loginfo:

Checking in Footer.wm;
/usr/local/tigris/data/helm/cvs/repository/look/www/master/Footer.wm,v <-- Footer.wm
new revision: 1.25; previous revision: 1.24
1 file(s) commited
Processing log script arguments...
Mailing the commit message to address@hidden (from address@hidden)
cvs update: Updating .
cvs update: Updating master
RCS file: /cvs/look/www/master/Footer.wm,v
retrieving revision 1.24
retrieving revision 1.25
Merging differences between 1.24 and 1.25 into Footer.wm
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in master/Footer.wm
C master/Footer.wm

Why is it applying a patch when I explicitly want it to ignore what is on disk and just pull from the repository?

Thanks for any pointers.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]