[cvsnt] Re: Mergepoint question

[Starrett, Glen (AZ15)]

Hmmm... the list didn't like the attachment, so here it is in the body.
Note that the log is NOT sorted by the time of the update, but by the File
Revision.

Glen Starrett

>>>>
FWICT, CVSNT handles that rather handsomely.  I did some experimentation
with the branchpoint merging on a small module with several sandboxes
(checked out HEAD and branches) and was able to merge branch -> HEAD, HEAD
-> branch, multiple times, back and forth with no trouble at all.  Test it
out for yourself if you like, but here is a log from the file I was
"playing" with.

You'll notice the "mergepoint" fields in all records where I did a merge,
and the mergepoint record always contains the "from" version that was merged
in (the record already has the "old" and "new" of the file being merged).
<<<<
-------------------------------


RCS file: /test/blah/foo.php,v
Working file: foo.php
head: 1.10
branch:
locks: strict
access list:
symbolic names:
	glen: 1.6.0.2
	R2: 1.6
	R1-Fix: 1.1.0.2
	R1: 1.1
keyword substitution: kv
total revisions: 17;	selected revisions: 17
description:
----------------------------
revision 1.10
date: 2003/07/18 21:50:25;  author: gstarrett;  state: Exp;  lines: +2 -0;
kopt: kv;  commitid: 1d63f186ba00000;
bang bang on R2
----------------------------
revision 1.9
date: 2003/07/18 21:48:39;  author: gstarrett;  state: Exp;  lines: +8 -0;
kopt: kv;  commitid: 2473f186b350000;  mergepoint: 1.6.2.3;
Merge in changes from glen branch
----------------------------
revision 1.8
date: 2003/07/18 21:46:03;  author: gstarrett;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 2473f186a9a0000;
more changes not on Glen branch
----------------------------
revision 1.7
date: 2003/07/18 21:44:06;  author: gstarrett;  state: Exp;  lines: +4 -0;
kopt: kv;  commitid: 18c3f186a250000;
More dev on R2
----------------------------
revision 1.6
date: 2003/07/18 21:37:35;  author: gstarrett;  state: Exp;  lines: +1 -1;
kopt: kv;  commitid: 1743f18689d0000;
branches:  1.6.2;
update R2 after fixes applied
----------------------------
revision 1.5
date: 2003/07/18 21:33:01;  author: gstarrett;  state: Exp;  lines: +2 -0;
kopt: kv;  commitid: 21c3f18678b0000;  mergepoint: 1.1.2.3;
Merged in change 3 from R1-fix
----------------------------
revision 1.4
date: 2003/07/18 21:30:35;  author: gstarrett;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 22b3f1866f80000;  mergepoint: 1.1.2.2;
Merged in change 2 from R1-fix
----------------------------
revision 1.3
date: 2003/07/18 21:28:41;  author: gstarrett;  state: Exp;  lines: +1 -1;
kopt: kv;  commitid: 1d63f1866880000;  mergepoint: 1.1.2.1;
Merged in change 1 from R1-fix
----------------------------
revision 1.2
date: 2003/07/18 21:25:46;  author: gstarrett;  state: Exp;  lines: +12 -0;
kopt: kv;  commitid: 21b3f1865d80000;
R2 modifications
----------------------------
revision 1.1
date: 2003/07/18 21:24:37;  author: gstarrett;  state: Exp;  kopt: kv;
commitid: 25a3f1865930000;
branches:  1.1.2;
Initial version
----------------------------
revision 1.1.2.3
date: 2003/07/18 21:31:29;  author: gstarrett;  state: Exp;  lines: +2 -0;
kopt: kv;  commitid: 1e03f1867300000;
Fix R1 problem 3
----------------------------
revision 1.1.2.2
date: 2003/07/18 21:29:42;  author: gstarrett;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 2443f1866c40000;
Fix R1 problem 2
----------------------------
revision 1.1.2.1
date: 2003/07/18 21:27:15;  author: gstarrett;  state: Exp;  lines: +1 -1;
kopt: kv;  commitid: 1bd3f1866310000;
Fix R1 problem
----------------------------
revision 1.6.2.4
date: 2003/07/18 21:51:47;  author: gstarrett;  state: Exp;  lines: +10 -0;
kopt: kv;  commitid: 23e3f186bf10000;  mergepoint: 1.10;
merge from head to glen again after merging glen to head
----------------------------
revision 1.6.2.3
date: 2003/07/18 21:47:03;  author: gstarrett;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 643f186ad50000;  mergepoint: 1.8;
Merge changes from HEAD R2 again
----------------------------
revision 1.6.2.2
date: 2003/07/18 21:45:43;  author: gstarrett;  state: Exp;  lines: +7 -1;
kopt: kv;  commitid: 1743f186a860000;  mergepoint: 1.7;
change Glen again
----------------------------
revision 1.6.2.1
date: 2003/07/18 21:42:18;  author: gstarrett;  state: Exp;  lines: +6 -0;
kopt: kv;  commitid: 643f1869b80000;
glen branch
============================================================================
=