Mercurial > hg
annotate tests/test-convert-cvs-synthetic.out @ 12515:b6a784e39ad4
tests: unify test-convert-bzr-ghosts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 14:36:49 -0500 |
parents | 56a5f80556f5 |
children |
rev | line source |
---|---|
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
1 % create cvs repository with one project |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
2 cvs -f -d *REPO* init |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
3 cvs -f -q co proj |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
4 % create file1 on the trunk |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
5 cvs -f -Q add file1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
6 cvs -f ci -madd file1 on trunk file1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
7 % create two branches |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
8 cvs -f -q tag -b v1_0 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
9 T file1 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
10 cvs -f -q tag -b v1_1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
11 T file1 |
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
12 % create file2 on branch v1_0 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
13 cvs -f -Q up -rv1_0 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
14 cvs -f -Q add file2 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
15 cvs -f ci -madd file2 file2 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
16 % create file3, file4 on branch v1_1 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
17 cvs -f -Q up -rv1_1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
18 cvs -f -Q add file3 file4 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
19 cvs -f ci -madd file3, file4 on branch v1_1 file3 file4 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
20 % merge file2 from v1_0 to v1_1 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
21 cvs -f -Q up -jv1_0 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
22 cvs -f ci -mMERGE from v1_0: add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
23 % create branch v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
24 cvs -f -Q up -A |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
25 cvs -f -q tag -b v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
26 T file1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
27 % create file5 on branch v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
28 cvs -f -Q up -rv1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
29 cvs -f ci -madd file5 on v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
30 % create file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
31 cvs -f -Q up -A |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
32 cvs -f -Q add file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
33 cvs -f ci -madd file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
34 % merge file5 from v1_2 to trunk |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
35 cvs -f -Q up -A |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
36 cvs -f -Q up -jv1_2 file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
37 cvs -f ci -mMERGE from v1_2: add file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
38 % merge file6 from trunk to v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
39 cvs -f -Q up -rv1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
40 cvs -f up -jHEAD file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
41 U file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
42 cvs -f ci -mMERGE from HEAD: add file6 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
43 % cvs rlog output |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
44 RCS file: *REPO*/proj/file1,v |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
45 revision 1.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
46 RCS file: *REPO*/proj/Attic/file2,v |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
47 revision 1.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
48 revision 1.1.4.2 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
49 revision 1.1.4.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
50 revision 1.1.2.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
51 RCS file: *REPO*/proj/Attic/file3,v |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
52 revision 1.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
53 revision 1.1.2.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
54 RCS file: *REPO*/proj/Attic/file4,v |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
55 revision 1.1 |
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7865
diff
changeset
|
56 revision 1.1.2.1 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
57 RCS file: *REPO*/proj/file5,v |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
58 revision 1.2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
59 revision 1.1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
60 revision 1.1.2.1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
61 RCS file: *REPO*/proj/file6,v |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
62 revision 1.1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
63 revision 1.1.2.2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
64 revision 1.1.2.1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
65 % convert to hg (#1) |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
66 initializing destination proj.hg repository |
8048
d22432bdcba1
convert/cvs: delay CVS log parsing after initialization (issue1581/2)
Patrick Mezard <pmezard@gmail.com>
parents:
7865
diff
changeset
|
67 connecting to *REPO* |
d22432bdcba1
convert/cvs: delay CVS log parsing after initialization (issue1581/2)
Patrick Mezard <pmezard@gmail.com>
parents:
7865
diff
changeset
|
68 scanning source... |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
69 collecting CVS rlog |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
70 15 log entries |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
71 creating changesets |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
72 8 changeset entries |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
73 sorting... |
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
74 converting... |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
75 7 add file1 on trunk |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
76 6 add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
77 5 add file3, file4 on branch v1_1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
78 4 MERGE from v1_0: add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
79 3 add file5 on v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
80 2 add file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
81 1 MERGE from v1_2: add file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
82 0 MERGE from HEAD: add file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
83 % hg glog output (#1) |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
84 o 7 MERGE from HEAD: add file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
85 | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
86 | o 6 MERGE from v1_2: add file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
87 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
88 | o 5 add file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
89 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
90 o | 4 add file5 on v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
91 |/ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
92 | o 3 MERGE from v1_0: add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
93 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
94 | o 2 add file3, file4 on branch v1_1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
95 |/ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
96 | o 1 add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
97 |/ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
98 o 0 add file1 on trunk |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
99 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
100 % convert to hg (#2: with merge detection) |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
101 initializing destination proj.hg2 repository |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
102 connecting to *REPO* |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
103 scanning source... |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
104 collecting CVS rlog |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
105 15 log entries |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
106 creating changesets |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
107 8 changeset entries |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
108 sorting... |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
109 converting... |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
110 7 add file1 on trunk |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
111 6 add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
112 5 add file3, file4 on branch v1_1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
113 4 MERGE from v1_0: add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
114 3 add file5 on v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
115 2 add file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
116 1 MERGE from v1_2: add file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
117 0 MERGE from HEAD: add file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
118 % hg glog output (#2) |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
119 o 7 MERGE from HEAD: add file6 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
120 |\ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
121 | o 6 MERGE from v1_2: add file5 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
122 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
123 | o 5 add file6 on trunk post-v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
124 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
125 o | 4 add file5 on v1_2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
126 |/ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
127 | o 3 MERGE from v1_0: add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
128 | |\ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
129 +---o 2 add file3, file4 on branch v1_1 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
130 | | |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
131 | o 1 add file2 |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
132 |/ |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
133 o 0 add file1 on trunk |
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8082
diff
changeset
|
134 |