I'm a newcomer to CVS, so what I say may need interpretation, or I many be
plain wrong.
The main "cvs.ps" document (160+ pages in 1.10.8) contains some very
useful illustrations in the "Branching and merging" chapter. But they
seem (to me) to be initially misleading in discussing merging, and
particularly "merging ... several times".
The picture is of the form:
1.1 --- 1.2 --- 1.3 --- 1.4 --- 1.5 <- The main trunk
| *
| *
Branch R1fix-> +-- 1.2.2.1 --- 1.2.2.2 --- 1.2.2.3
I think the picture would be clearer by moving the lower label to the
other end of its branch, thus:
1.1 --- 1.2 --- 1.3 --- 1.4 --- 1.5 <- The main trunk
| *
| *
+-- 1.2.2.1 --- 1.2.2.2 --- 1.2.2.3 <- Branch R1fix
Because when it comes to discussing the use of two '-j' options:
cvs update -j 1.2.2.2 -j R1fix m.c
(to merge the latest change increments from the branch to the head) such a
change makes it clearer, especially to beginners, that the "R1fix" label
applies to the latest (not earliest) end of the branch.
Thoughts?
(Could you acknowledge receipt of this note, please? Thanks.)
--
: David Lee I.T. Service :
: Systems Programmer Computer Centre :
: University of Durham :
: http://www.dur.ac.uk/~dcl0tdl South Road :
: Durham :
: Phone: +44 191 374 2882 U.K. :
