Mercurial > hg

comparison tests/test-convert-cvsnt-mergepoints.out @ 8821:c66e324d3961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).
author Greg Ward <greg-hg@gerg.ca>
date Mon, 15 Jun 2009 20:35:19 -0400
parents e93ab347c814
children
comparison
equal deleted inserted replaced
8820:e8cb1fa0d4a9 8821:c66e324d3961
2 cvs -f -Q -d *REPO* init 2 cvs -f -Q -d *REPO* init
3 % checkout #1: add foo.txt 3 % checkout #1: add foo.txt
4 cvs -f -Q checkout -d cvsworktmp . 4 cvs -f -Q checkout -d cvsworktmp .
5 cvs -f -Q add foo 5 cvs -f -Q add foo
6 cvs -f -Q add foo.txt 6 cvs -f -Q add foo.txt
7 cvs -f ci -m foo.txt 7 cvs -f ci -f -m add foo.txt foo.txt
8 initial revision: 1.1 8 initial revision: 1.1
9 % checkout #2: create MYBRANCH1 and modify foo.txt on it 9 % checkout #2: create MYBRANCH1 and modify foo.txt on it
10 cvs -f -Q checkout -d cvswork foo 10 cvs -f -Q checkout -d cvswork foo
11 cvs -f -q rtag -b -R MYBRANCH1 foo 11 cvs -f -q rtag -b -R MYBRANCH1 foo
12 cvs -f -Q update -P -r MYBRANCH1 12 cvs -f -Q update -P -r MYBRANCH1
13 cvs -f ci -m bar 13 cvs -f ci -f -m bar foo.txt
14 new revision: 1.1.2.1; previous revision: 1.1 14 new revision: 1.1.2.1; previous revision: 1.1
15 cvs -f ci -m baz 15 cvs -f ci -f -m baz foo.txt
16 new revision: 1.1.2.2; previous revision: 1.1.2.1 16 new revision: 1.1.2.2; previous revision: 1.1.2.1
17 % create MYBRANCH1_2 and modify foo.txt some more 17 % create MYBRANCH1_2 and modify foo.txt some more
18 cvs -f -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo 18 cvs -f -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
19 cvs -f -Q update -P -r MYBRANCH1_2 19 cvs -f -Q update -P -r MYBRANCH1_2
20 cvs -f ci -m bazzie 20 cvs -f ci -f -m bazzie foo.txt
21 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2 21 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2
22 % create MYBRANCH1_1 and modify foo.txt yet again 22 % create MYBRANCH1_1 and modify foo.txt yet again
23 cvs -f -q rtag -b -R MYBRANCH1_1 foo 23 cvs -f -q rtag -b -R MYBRANCH1_1 foo
24 cvs -f -Q update -P -r MYBRANCH1_1 24 cvs -f -Q update -P -r MYBRANCH1_1
25 cvs -f ci -m quux 25 cvs -f ci -f -m quux foo.txt
26 new revision: 1.1.4.1; previous revision: 1.1 26 new revision: 1.1.4.1; previous revision: 1.1
27 % merge MYBRANCH1 to MYBRANCH1_1 27 % merge MYBRANCH1 to MYBRANCH1_1
28 rcsmerge: warning: conflicts during merge 28 rcsmerge: warning: conflicts during merge
29 cvs -f -Q update -P -jMYBRANCH1 29 cvs -f -Q update -P -jMYBRANCH1
30 RCS file: *REPO*/foo/foo.txt,v 30 RCS file: *REPO*/foo/foo.txt,v
31 retrieving revision 1.1 31 retrieving revision 1.1
32 retrieving revision 1.1.2.2 32 retrieving revision 1.1.2.2
33 Merging differences between 1.1 and 1.1.2.2 into foo.txt 33 Merging differences between 1.1 and 1.1.2.2 into foo.txt
34 cvs -f ci -m merge1 34 cvs -f ci -f -m merge1+clobber foo.txt
35 new revision: 1.1.4.2; previous revision: 1.1.4.1 35 new revision: 1.1.4.2; previous revision: 1.1.4.1
36 % return to trunk and merge MYBRANCH1_2 36 % return to trunk and merge MYBRANCH1_2
37 cvs -f -Q update -P -A 37 cvs -f -Q update -P -A
38 cvs -f -Q update -P -jMYBRANCH1_2 38 cvs -f -Q update -P -jMYBRANCH1_2
39 RCS file: *REPO*/foo/foo.txt,v 39 RCS file: *REPO*/foo/foo.txt,v
40 retrieving revision 1.1 40 retrieving revision 1.1
41 retrieving revision 1.1.2.2.2.1 41 retrieving revision 1.1.2.2.2.1
42 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt 42 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
43 cvs -f ci -m merge2 43 cvs -f ci -f -m merge2 foo.txt
44 new revision: 1.2; previous revision: 1.1 44 new revision: 1.2; previous revision: 1.1
45 collecting CVS rlog 45 collecting CVS rlog
46 7 log entries 46 7 log entries
47 creating changesets 47 creating changesets
48 7 changeset entries 48 7 changeset entries