Mercurial > hg
annotate tests/test-convert-cvs-detectmerge.t @ 21350:dfcef61f5bd4
run-tests: move cleanup() into TestRunner
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 19 Apr 2014 23:35:27 -0700 |
parents | aa9385f983fa |
children | 7a9cbb315d84 |
rev | line source |
---|---|
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
1 Test config convert.cvsps.mergefrom config setting. |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
2 (Should test similar mergeto feature, but I don't understand it yet.) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
3 Requires builtin cvsps. |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
4 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
5 $ "$TESTDIR/hghave" cvs || exit 80 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
6 $ CVSROOT=`pwd`/cvsrepo |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
7 $ export CVSROOT |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
8 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
9 $ cvscall() |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
10 > { |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
11 > cvs -f "$@" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
12 > } |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
13 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
14 output of 'cvs ci' varies unpredictably, so just discard it |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
15 XXX copied from test-convert-cvs-synthetic |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
16 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
17 $ cvsci() |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
18 > { |
14569
017ab404e588
tests: fix up date ambiguity in cvs test
Matt Mackall <mpm@selenic.com>
parents:
12640
diff
changeset
|
19 > sleep 1 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
20 > cvs -f ci "$@" > /dev/null |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
21 > } |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
22 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
23 XXX copied from test-convert-cvs-synthetic |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
24 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
25 $ echo "[extensions]" >> $HGRCPATH |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
26 $ echo "convert = " >> $HGRCPATH |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
27 $ echo "[convert]" >> $HGRCPATH |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
28 $ echo "cvsps.cache=0" >> $HGRCPATH |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
29 $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
30 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
31 create cvs repository with one project |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
32 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
33 $ mkdir cvsrepo |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
34 $ cvscall -q -d "$CVSROOT" init |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
35 $ mkdir cvsrepo/proj |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
36 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
37 populate cvs repository |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
38 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
39 $ cvscall -Q co proj |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
40 $ cd proj |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
41 $ touch file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
42 $ cvscall -Q add file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
43 $ cvsci -m"add file1 on trunk" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
44 cvs commit: Examining . |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
45 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
46 create two release branches |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
47 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
48 $ cvscall -q tag -b v1_0 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
49 T file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
50 $ cvscall -q tag -b v1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
51 T file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
52 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
53 modify file1 on branch v1_0 |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
54 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
55 $ cvscall -Q update -rv1_0 |
14824
7698c275aa56
tests: restore previous fix for date ambiguity in cvs test
Mads Kiilerich <mads@kiilerich.com>
parents:
14569
diff
changeset
|
56 $ sleep 1 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
57 $ echo "change" >> file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
58 $ cvsci -m"add text" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
59 cvs commit: Examining . |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
60 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
61 make unrelated change on v1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
62 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
63 $ cvscall -Q update -rv1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
64 $ touch unrelated |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
65 $ cvscall -Q add unrelated |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
66 $ cvsci -m"unrelated change" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
67 cvs commit: Examining . |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
68 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
69 merge file1 to v1_1 |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
70 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
71 $ cvscall -Q update -jv1_0 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
72 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
73 retrieving revision 1.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
74 retrieving revision 1.1.2.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
75 Merging differences between 1.1 and 1.1.2.1 into file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
76 $ cvsci -m"add text [MERGE from v1_0]" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
77 cvs commit: Examining . |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
78 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
79 merge change to trunk |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
80 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
81 $ cvscall -Q update -A |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
82 $ cvscall -Q update -jv1_1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
83 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
84 retrieving revision 1.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
85 retrieving revision 1.1.4.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
86 Merging differences between 1.1 and 1.1.4.1 into file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
87 $ cvsci -m"add text [MERGE from v1_1]" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
88 cvs commit: Examining . |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
89 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
90 non-merged change on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
91 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
92 $ echo "foo" > file2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
93 $ cvscall -Q add file2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
94 $ cvsci -m"add file2 on trunk" file2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
95 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
96 this will create rev 1.3 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
97 change on trunk to backport |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
98 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
99 $ echo "backport me" >> file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
100 $ cvsci -m"add other text" file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
101 $ cvscall log file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
102 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
103 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
104 Working file: file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
105 head: 1.3 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
106 branch: |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
107 locks: strict |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
108 access list: |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
109 symbolic names: |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
110 v1_1: 1.1.0.4 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
111 v1_0: 1.1.0.2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
112 keyword substitution: kv |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
113 total revisions: 5; selected revisions: 5 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
114 description: |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
115 ---------------------------- |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
116 revision 1.3 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
117 date: * (glob) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
118 add other text |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
119 ---------------------------- |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
120 revision 1.2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
121 date: * (glob) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
122 add text [MERGE from v1_1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
123 ---------------------------- |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
124 revision 1.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
125 date: * (glob) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
126 branches: 1.1.2; 1.1.4; |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
127 add file1 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
128 ---------------------------- |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
129 revision 1.1.4.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
130 date: * (glob) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
131 add text [MERGE from v1_0] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
132 ---------------------------- |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
133 revision 1.1.2.1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
134 date: * (glob) |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
135 add text |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
136 ============================================================================= |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
137 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
138 XXX how many ways are there to spell "trunk" with CVS? |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
139 backport trunk change to v1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
140 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
141 $ cvscall -Q update -rv1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
142 $ cvscall -Q update -j1.2 -j1.3 file1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
143 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
144 retrieving revision 1.2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
145 retrieving revision 1.3 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
146 Merging differences between 1.2 and 1.3 into file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
147 $ cvsci -m"add other text [MERGE from HEAD]" file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
148 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
149 fix bug on v1_1, merge to trunk with error |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
150 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
151 $ cvscall -Q update -rv1_1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
152 $ echo "merge forward" >> file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
153 $ cvscall -Q tag unmerged |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
154 $ cvsci -m"fix file1" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
155 cvs commit: Examining . |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
156 $ cvscall -Q update -A |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
157 $ cvscall -Q update -junmerged -jv1_1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
158 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
159 retrieving revision 1.1.4.2 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
160 retrieving revision 1.1.4.3 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
161 Merging differences between 1.1.4.2 and 1.1.4.3 into file1 |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
162 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
163 note the typo in the commit log message |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
164 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
165 $ cvsci -m"fix file1 [MERGE from v1-1]" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
166 cvs commit: Examining . |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
167 $ cvs -Q tag -d unmerged |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
168 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
169 convert to hg |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
170 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
171 $ cd .. |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
172 $ hg convert proj proj.hg |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
173 initializing destination proj.hg repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12585
diff
changeset
|
174 connecting to $TESTTMP/cvsrepo |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
175 scanning source... |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
176 collecting CVS rlog |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
177 12 log entries |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
178 creating changesets |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
179 warning: CVS commit message references non-existent branch 'v1-1': |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
180 fix file1 [MERGE from v1-1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
181 10 changeset entries |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
182 sorting... |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
183 converting... |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
184 9 add file1 on trunk |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
185 8 unrelated change |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
186 7 add text |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
187 6 add text [MERGE from v1_0] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
188 5 add text [MERGE from v1_1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
189 4 add file2 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
190 3 add other text |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
191 2 add other text [MERGE from HEAD] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
192 1 fix file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
193 0 fix file1 [MERGE from v1-1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
194 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
195 complete log |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
196 |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
197 $ template="{rev}: '{branches}' {desc}\n" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
198 $ hg -R proj.hg log --template="$template" |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
199 9: '' fix file1 [MERGE from v1-1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
200 8: 'v1_1' fix file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
201 7: 'v1_1' add other text [MERGE from HEAD] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
202 6: '' add other text |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
203 5: '' add file2 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
204 4: '' add text [MERGE from v1_1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
205 3: 'v1_1' add text [MERGE from v1_0] |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
206 2: 'v1_0' add text |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
207 1: 'v1_1' unrelated change |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
208 0: '' add file1 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
209 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
210 graphical log |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
211 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18376
diff
changeset
|
212 $ hg -R proj.hg log -G --template="$template" |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
213 o 9: '' fix file1 [MERGE from v1-1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
214 | |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
215 | o 8: 'v1_1' fix file1 |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
216 | | |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
217 | o 7: 'v1_1' add other text [MERGE from HEAD] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
218 |/| |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
219 o | 6: '' add other text |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
220 | | |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
221 o | 5: '' add file2 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
222 | | |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
223 o | 4: '' add text [MERGE from v1_1] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
224 |\| |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
225 | o 3: 'v1_1' add text [MERGE from v1_0] |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
226 | |\ |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
227 +---o 2: 'v1_0' add text |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
228 | | |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
14824
diff
changeset
|
229 | o 1: 'v1_1' unrelated change |
12521
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
230 |/ |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
231 o 0: '' add file1 on trunk |
539480ce1c89
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
232 |