14 adding file changes |
14 adding file changes |
15 added 1 changesets with 2 changes to 2 files |
15 added 1 changesets with 2 changes to 2 files |
16 (run 'hg update' to get a working copy) |
16 (run 'hg update' to get a working copy) |
17 merging for foo |
17 merging for foo |
18 resolving manifests |
18 resolving manifests |
19 force None allow 1 moddirstate True linear False |
|
20 ancestor a0486579db29 local ef1b4dbe2193 remote 336d8406d617 |
|
21 remote bar is newer, get |
|
22 foo versions differ, resolve |
|
23 getting bar |
19 getting bar |
24 merging foo |
20 merging foo |
25 resolving foo |
21 resolving foo |
26 file foo: other 33d1fb69067a ancestor b8e02f643373 |
|
27 we shouldn't have anything but foo in merge state here |
22 we shouldn't have anything but foo in merge state here |
28 m 644 3 foo |
23 m 644 3 foo |
29 main: we should have a merge here |
24 main: we should have a merge here |
30 rev offset length base linkrev nodeid p1 p2 |
25 rev offset length base linkrev nodeid p1 p2 |
31 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |
26 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |
32 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 |
27 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 |
33 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 |
28 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 |
34 3 209 66 3 3 9da9fbd62226 f6718a9cb7f3 bdd988058d16 |
29 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 |
|
30 log should show foo and quux changed |
|
31 changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 |
|
32 tag: tip |
|
33 parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f |
|
34 parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e |
|
35 user: test |
|
36 date: Thu Jan 1 00:00:00 1970 +0000 |
|
37 files: foo quux |
|
38 description: |
|
39 merge |
|
40 |
|
41 |
35 foo: we should have a merge here |
42 foo: we should have a merge here |
36 rev offset length base linkrev nodeid p1 p2 |
43 rev offset length base linkrev nodeid p1 p2 |
37 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
44 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
38 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
45 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
39 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
46 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
48 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
55 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
49 quux: we shouldn't have a merge here |
56 quux: we shouldn't have a merge here |
50 rev offset length base linkrev nodeid p1 p2 |
57 rev offset length base linkrev nodeid p1 p2 |
51 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
58 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
52 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
59 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
|
60 manifest entries should match tips of all files |
|
61 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar |
|
62 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz |
|
63 aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo |
|
64 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux |
53 everything should be clean now |
65 everything should be clean now |
54 checking changesets |
66 checking changesets |
55 checking manifests |
67 checking manifests |
56 crosschecking files in changesets and manifests |
68 crosschecking files in changesets and manifests |
57 checking files |
69 checking files |