13 user: test |
13 user: test |
14 date: Mon Jan 12 13:46:40 1970 +0000 |
14 date: Mon Jan 12 13:46:40 1970 +0000 |
15 summary: 1 |
15 summary: 1 |
16 |
16 |
17 resolving manifests |
17 resolving manifests |
18 overwrite False branchmerge False partial False |
18 overwrite False partial False |
19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
19 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
20 a: versions differ -> m |
20 a: versions differ -> m |
21 b: remote created -> g |
21 b: remote created -> g |
22 merging a |
22 merging a |
23 resolving a |
23 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
24 my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b |
|
25 getting b |
24 getting b |
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
25 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
27 changeset: 1:802f095af299 |
26 changeset: 1:802f095af299 |
28 tag: tip |
27 tag: tip |
29 user: test |
28 user: test |
30 date: Mon Jan 12 13:46:40 1970 +0000 |
29 date: Mon Jan 12 13:46:40 1970 +0000 |
31 summary: 2 |
30 summary: 2 |
32 |
31 |
33 resolving manifests |
32 resolving manifests |
34 overwrite False branchmerge False partial False |
33 overwrite False partial False |
35 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b |
34 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
36 b: remote deleted -> r |
35 b: remote deleted -> r |
37 removing b |
36 removing b |
38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
39 changeset: 0:33aaa84a386b |
38 changeset: 0:33aaa84a386b |
40 user: test |
39 user: test |
47 user: test |
46 user: test |
48 date: Mon Jan 12 13:46:40 1970 +0000 |
47 date: Mon Jan 12 13:46:40 1970 +0000 |
49 summary: 1 |
48 summary: 1 |
50 |
49 |
51 resolving manifests |
50 resolving manifests |
52 overwrite False branchmerge False partial False |
51 overwrite False partial False |
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
52 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
54 a: versions differ -> m |
53 a: versions differ -> m |
55 b: remote created -> g |
54 b: remote created -> g |
56 merging a |
55 merging a |
57 resolving a |
56 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
58 my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b |
|
59 getting b |
57 getting b |
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61 changeset: 1:802f095af299 |
59 changeset: 1:802f095af299 |
62 tag: tip |
60 tag: tip |
63 user: test |
61 user: test |
98 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
99 failed |
97 failed |
100 abort: outstanding uncommitted changes |
98 abort: outstanding uncommitted changes |
101 failed |
99 failed |
102 resolving manifests |
100 resolving manifests |
103 overwrite False branchmerge True partial False |
101 overwrite False partial False |
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b |
102 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
105 a: versions differ -> m |
103 a: versions differ -> m |
106 b: versions differ -> m |
104 b: versions differ -> m |
107 merging a |
105 merging a |
108 resolving a |
106 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
109 my a@802f095af299 other a@030602aee63d ancestor a@33aaa84a386b |
|
110 merging b |
107 merging b |
111 resolving b |
108 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 |
112 my b@802f095af299 other b@030602aee63d ancestor b@000000000000 |
|
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
109 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) |
110 (branch merge, don't forget to commit) |
115 changeset: 1:802f095af299 |
111 changeset: 1:802f095af299 |
116 user: test |
112 user: test |
117 date: Mon Jan 12 13:46:40 1970 +0000 |
113 date: Mon Jan 12 13:46:40 1970 +0000 |