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

Bug#371835: marked as done (cvsps -u mistakes branchpoint for the parent)

Your message dated Wed, 05 Sep 2007 13:09:07 -0400
with message-id <1189012147.7183.18.camel@siren>
and subject line Resolved
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: cvsps
Version: 2.1-1
Severity: important

As shown by the script below, "cvsps -u" is confused by commits on
another branch: it seems that if there is a commit on another branch
in the cache already, cvsps gets confused and selects for parent the
branchpoint (if not on trunk) or decides it is the INITIAL commit for
the file (if on trunk).  (Un)comment the last "cvsps -x" to switch
between the 2 cases.

Warning: if you do not see 4 revs in the cvsps output, you probably
hit a transient cvs issue, I'll report it as well.

==== script
#!/bin/sh
set -ex

# setup repo and working area
cvs -d $PWD/root init
mkdir root/test
cvs -d $PWD/root co test
cd test

# trunk
mkdir dir
cvs add dir
touch file
cvs add file
cvs ci -m "add file"
sleep 2

cvs tag A

# branch based on trunk
cvs tag -b A_HEAD
cvs up -r A_HEAD
echo >> file
cvs ci -m "branch work"
sleep 2

# init cache
cvsps --norc -x >/dev/null

# back to trunk
cvs up -A
echo >> file
cvs ci -m "trunk work"
sleep 2

# reinit cache to see the bug on the branch rather than on trunk
#cvsps --norc -x >/dev/null

# back to branch again
cvs up -r A_HEAD
echo >> file
cvs ci -m "more branch work"

# trigger problem
cvsps --norc -u
==== output with cache reinit after patchset 2 only
PatchSet 1 
Date: 2006/06/07 21:31:30
Author: dwitch
Branch: HEAD
Tag: A 
Log:
add file

Members: 
        file:INITIAL->1.1 

---------------------
PatchSet 2 
Date: 2006/06/07 21:31:33
Author: dwitch
Branch: A_HEAD
Tag: (none) 
Log:
branch work

Members: 
        file:1.1->1.1.2.1 

---------------------
PatchSet 3 
Date: 2006/06/07 21:31:37
Author: dwitch
Branch: HEAD
Tag: (none) 
Log:
trunk work

Members: 
        file:INITIAL->1.2 
==== output with cache reinit after patchset 3
PatchSet 1
Date: 2006/06/07 21:23:17
Author: dwitch
Branch: HEAD
Tag: A
Log:
add file

Members:
        file:INITIAL->1.1

---------------------
PatchSet 2
Date: 2006/06/07 21:23:19
Author: dwitch
Branch: A_HEAD
Tag: (none)
Log:
branch work

Members:
        file:1.1->1.1.2.1

---------------------
PatchSet 3
Date: 2006/06/07 21:23:22
Author: dwitch
Branch: HEAD
Tag: (none)
Log:
trunk work

Members:
        file:1.1->1.2

---------------------
PatchSet 4
Date: 2006/06/07 21:23:25
Author: dwitch
Branch: A_HEAD
Tag: (none)
Log:
more branch work

Members:
        file:1.1->1.1.2.2
====

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>

--- End Message ---
--- Begin Message --- 
The lastest package properly follows the ancestority correctly.
Michael

--- End Message ---
Reply to: