|
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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 (branch merge, don't forget to commit) |
|
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 (branch merge, don't forget to commit) |
|
12 requesting all changes |
|
13 adding changesets |
|
14 adding manifests |
|
15 adding file changes |
|
16 added 4 changesets with 3 changes to 3 files |
|
17 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 requesting all changes |
|
19 adding changesets |
|
20 adding manifests |
|
21 adding file changes |
|
22 added 4 changesets with 3 changes to 3 files |
|
23 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 searching for changes |
|
25 changeset: 4:fdb3c546e859 |
|
26 tag: tip |
|
27 parent: 1:1f703b3fcbc6 |
|
28 parent: 2:de997049e034 |
|
29 user: test |
|
30 date: Mon Jan 12 13:46:40 1970 +0000 |
|
31 summary: m2 |
|
32 |
|
33 searching for changes |
|
34 changeset: 3:f40f830c0024 |
|
35 parent: 2:de997049e034 |
|
36 parent: 1:1f703b3fcbc6 |
|
37 user: test |
|
38 date: Mon Jan 12 13:46:40 1970 +0000 |
|
39 summary: m1 |
|
40 |
|
41 searching for changes |
|
42 changeset: 3:f40f830c0024 |
|
43 tag: tip |
|
44 parent: 2:de997049e034 |
|
45 parent: 1:1f703b3fcbc6 |
|
46 user: test |
|
47 date: Mon Jan 12 13:46:40 1970 +0000 |
|
48 summary: m1 |
|
49 |
|
50 searching for changes |
|
51 changeset: 3:fdb3c546e859 |
|
52 tag: tip |
|
53 parent: 1:1f703b3fcbc6 |
|
54 parent: 2:de997049e034 |
|
55 user: test |
|
56 date: Mon Jan 12 13:46:40 1970 +0000 |
|
57 summary: m2 |
|
58 |
|
59 pulling from a |
|
60 searching for changes |
|
61 adding changesets |
|
62 adding manifests |
|
63 adding file changes |
|
64 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
65 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
66 pulling from a |
|
67 searching for changes |
|
68 adding changesets |
|
69 adding manifests |
|
70 adding file changes |
|
71 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
72 (run 'hg heads' to see heads, 'hg merge' to merge) |