[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
anomoly merging from one branch to another
From: |
CHARLES HART, BLOOMBERG/ 499 PARK |
Subject: |
anomoly merging from one branch to another |
Date: |
Tue, 10 Dec 2002 16:30:41 -0500 (EST) |
I presume that the following commit message is a benign case of version 1.1.1.1
being renamed on output to the user. But I'm a bit more worried about the
message from checkout. What I did was to create a new file on a branch (so
there is no 1.1 yet), and then I used the branch copy, v1.1.2.1, to make yet
another branch copy, v1.1.4.1.
$ cvs checkout -r bb -j 1.1.2.1 wrk/fyle.txt
cvs server: warning: new-born wrk/fyle.txt has disappeared
U wrk/fyle.txt
$ cvs commit -m Deliver Task 1.1.2.1 work to stage wrk/fyle.txt
Checking in wrk/fyle.txt;
/home/cvsroot1/wrk/Attic/fyle.txt,v <-- fyle.txt
new revision: 1.1.4.1; previous revision: 1.1
done
-CTH
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- anomoly merging from one branch to another,
CHARLES HART, BLOOMBERG/ 499 PARK <=