1 adding init |
|
2 adding x |
|
3 adding y |
|
4 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
5 adding x |
|
6 adding y |
|
7 created new head |
|
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 (branch merge, don't forget to commit) |
|
10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 (branch merge, don't forget to commit) |
|
13 created new head |
|
14 requesting all changes |
|
15 adding changesets |
|
16 adding manifests |
|
17 adding file changes |
|
18 added 4 changesets with 3 changes to 3 files |
|
19 updating to branch default |
|
20 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 requesting all changes |
|
22 adding changesets |
|
23 adding manifests |
|
24 adding file changes |
|
25 added 4 changesets with 3 changes to 3 files |
|
26 updating to branch default |
|
27 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 comparing with b |
|
29 searching for changes |
|
30 changeset: 4:119caaef4ed1 |
|
31 tag: tip |
|
32 parent: 1:79f9e10cd04e |
|
33 parent: 2:8e1bb01c1a24 |
|
34 user: test |
|
35 date: Thu Jan 01 00:00:00 1970 +0000 |
|
36 summary: m2 |
|
37 |
|
38 comparing with c |
|
39 searching for changes |
|
40 changeset: 3:cbb48b367d1b |
|
41 parent: 2:8e1bb01c1a24 |
|
42 parent: 1:79f9e10cd04e |
|
43 user: test |
|
44 date: Thu Jan 01 00:00:00 1970 +0000 |
|
45 summary: m1 |
|
46 |
|
47 comparing with c |
|
48 searching for changes |
|
49 changeset: 3:cbb48b367d1b |
|
50 tag: tip |
|
51 parent: 2:8e1bb01c1a24 |
|
52 parent: 1:79f9e10cd04e |
|
53 user: test |
|
54 date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 summary: m1 |
|
56 |
|
57 comparing with b |
|
58 searching for changes |
|
59 changeset: 3:119caaef4ed1 |
|
60 tag: tip |
|
61 parent: 1:79f9e10cd04e |
|
62 parent: 2:8e1bb01c1a24 |
|
63 user: test |
|
64 date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 summary: m2 |
|
66 |
|
67 pulling from a |
|
68 searching for changes |
|
69 adding changesets |
|
70 adding manifests |
|
71 adding file changes |
|
72 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
73 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
74 pulling from a |
|
75 searching for changes |
|
76 adding changesets |
|
77 adding manifests |
|
78 adding file changes |
|
79 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
80 (run 'hg heads' to see heads, 'hg merge' to merge) |
|