[Top][All Lists]

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

bug in branch switching behaviour

From: Matthew Herrmann
Subject: bug in branch switching behaviour
Date: Tue, 5 Aug 2003 15:08:15 +1000

Hi All,

I'm having exactly the same problem as Jo in this post:

my sequence of steps was:

- current sandbox on branch BRANCH
- cvs update
- resolve conflicts -- don't commit! (need to put it on the branch)
- cvs rtag -rBRANCH -b NEW_BRANCH project
- cvs up -rNEW_BRANCH
- cvs commit

Fails with 'filename' had a conflict and has not been modified. These files
do not have any conflict markers any more, so it must be due to the "dummy
timestamp new-file" entry put in the entries file.

Are there any fixes yet for this in the newer versions?

I'm using CVSNT client and server Linux CVS with the 3-way
diffs patch.


Matthew Herrmann
VB6/SQL/Java/CVS Consultancy
Far Edge Technology

reply via email to

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