On Thu, May 25, 2006 at 08:51:44AM -0300, Henrique de Moraes Holschuh wrote: >> I cannot reproduce what you are describing. Could you please elaborate ? > >Sure. > >First, it happens on branches when using -j (some tag of head) -j (some >other tag of head). > >First, I tried in a local repo, I didn't reproduce it, BUT I got something >weird from cvs status anyway, so here it is: > >cvs status changelog >=================================================================== >File: changelog Status: Unresolved Conflict > > Working revision: 1.307.2.4 cvs status: Can't parse date/time: >`Result of merge UTC'. >Result of merge UTC > Repository revision: 1.307.2.4 >/home/cvs/debian/cyrus21-imapd/debian/changelog,v > Commit Identifier: (none) > Sticky Tag: sarge-branch (branch: 1.307.2) > Sticky Date: (none) > Sticky Options: (none) > >Notice the strange error message "cvs status: Can't parse date/time: >`Result of merge UTC'." > >Then I tried it using a remote repository, in Alioth, over ssh. Here's the >full dump: > >$ export CVSROOT=:ext:[EMAIL PROTECTED]:/cvsroot/pkg-hpijs > >$ cvs -q checkout -d test-merge -r sarge-backport-branch hplip > [ messages from cvs checkout removed -- all works fine ] > >$ cd test-merge/ > >$ cvs log debian/changelog | head -20 >RCS file: /cvsroot/pkg-hpijs/hplip/debian/changelog,v >Working file: debian/changelog >head: 1.207 >branch: >locks: strict >access list: >symbolic names: > debian_version_0_9_11-1bpo1: 1.102.2.7 > debian_version_0_9_11-2: 1.207 > debian_version_0_9_11-1: 1.202 > debian_version_0_9_10-1: 1.187 > debian_version_0_9_9-2: 1.181 > debian_version_0_9_9-1: 1.177 > debian_version_0_9_8-1_unreleased: 1.160 > debian_version_0_9_7-3bpo1: 1.102.2.6 > debian_version_0_9_7-4: 1.132 > debian_version_0_9_7-3: 1.130 > debian_version_0_9_7-0_2sarge1: 1.102.2.3 > debian_version_0_9_7-2: 1.128 > >$ cvs update -dP -j debian_version_0_9_7-3 -j debian_version_0_9_11-2 > [ cvs update log removed. Some conflicts happen, no weird error messages >show up ] > >$ cvs status debian/README.Source >=================================================================== >File: README.Source Status: Up-to-date > > Working revision: 1.5.2.1 > Repository revision: 1.5.2.1 >/cvsroot/pkg-hpijs/hplip/debian/README.Source,v > Sticky Tag: sarge-backport-branch (branch: 1.5.2) > Sticky Date: (none) > Sticky Options: (none) > >$ head -n6 debian/README.Source ><<<<<<< README.Source >$Id: README.Source,v 1.5.2.1 2006/05/24 03:40:28 hmh Exp $ >======= >$Id: README.Source,v 1.6 2006/03/18 19:09:22 hmh Exp $ >>>>>>>> 1.6 > > >Notice the file has a broken conflict, which is not detected by cvs status. >Nothing else detects it either, if I commit, I will commit a conflicted file >with conflict hunks.
It seems this is a design decision by CVS upstream - see http://www.cygwin.com/ml/cygwin/2006-03/msg00668.html for another description of the same bug. It's rather annoying that they have changed the behaviour so blatantly from what people are used to... -- Steve McIntyre, Cambridge, UK. [EMAIL PROTECTED] Welcome my son, welcome to the machine.
signature.asc
Description: Digital signature
