|
990
|
1 creating base
|
|
|
2 creating branch a
|
|
|
3 creating branch b
|
|
|
4 we shouldn't have anything but n state here
|
|
|
5 n 644 2 bar
|
|
|
6 n 644 3 baz
|
|
|
7 n 644 3 foo
|
|
|
8 n 644 2 quux
|
|
|
9 merging
|
|
|
10 pulling from ../a
|
|
|
11 searching for changes
|
|
|
12 adding changesets
|
|
|
13 adding manifests
|
|
|
14 adding file changes
|
|
|
15 added 1 changesets with 2 changes to 2 files
|
|
|
16 (run 'hg update' to get a working copy)
|
|
|
17 merging for foo
|
|
|
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
|
|
|
24 merging foo
|
|
|
25 resolving foo
|
|
|
26 file foo: other 33d1fb69067a ancestor b8e02f643373
|
|
|
27 we shouldn't have anything but foo in merge state here
|
|
|
28 m 644 3 foo
|
|
|
29 main: we should have a merge here
|
|
|
30 rev offset length base linkrev nodeid p1 p2
|
|
|
31 0 0 73 0 0 cdca01651b96 000000000000 000000000000
|
|
|
32 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000
|
|
|
33 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000
|
|
|
34 3 209 66 3 3 9da9fbd62226 f6718a9cb7f3 bdd988058d16
|
|
|
35 foo: we should have a merge here
|
|
|
36 rev offset length base linkrev nodeid p1 p2
|
|
|
37 0 0 3 0 0 b8e02f643373 000000000000 000000000000
|
|
|
38 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
|
|
|
39 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000
|
|
|
40 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
|
|
|
41 bar: we shouldn't have a merge here
|
|
|
42 rev offset length base linkrev nodeid p1 p2
|
|
|
43 0 0 3 0 0 b8e02f643373 000000000000 000000000000
|
|
|
44 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000
|
|
|
45 baz: we shouldn't have a merge here
|
|
|
46 rev offset length base linkrev nodeid p1 p2
|
|
|
47 0 0 3 0 0 b8e02f643373 000000000000 000000000000
|
|
|
48 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
|
|
|
49 quux: we shouldn't have a merge here
|
|
|
50 rev offset length base linkrev nodeid p1 p2
|
|
|
51 0 0 3 0 0 b8e02f643373 000000000000 000000000000
|
|
|
52 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000
|
|
|
53 everything should be clean now
|
|
|
54 checking changesets
|
|
|
55 checking manifests
|
|
|
56 crosschecking files in changesets and manifests
|
|
|
57 checking files
|
|
|
58 4 files, 4 changesets, 10 total revisions
|
