equal
deleted
inserted
replaced
13 changeset: 0:33aaa84a386b |
13 changeset: 0:33aaa84a386b |
14 user: test |
14 user: test |
15 date: Mon Jan 12 13:46:40 1970 +0000 |
15 date: Mon Jan 12 13:46:40 1970 +0000 |
16 summary: 1 |
16 summary: 1 |
17 |
17 |
|
18 searching for copies back to rev 1 |
|
19 unmatched files in other: |
|
20 b |
18 resolving manifests |
21 resolving manifests |
19 overwrite False partial False |
22 overwrite False partial False |
20 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
23 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
21 searching for copies back to rev 1 |
|
22 unmatched files in other: |
|
23 b |
|
24 a: versions differ -> m |
24 a: versions differ -> m |
25 b: remote created -> g |
25 b: remote created -> g |
26 preserving a for resolve of a |
26 preserving a for resolve of a |
27 picked tool 'true' for a (binary False symlink False) |
27 picked tool 'true' for a (binary False symlink False) |
28 merging a |
28 merging a |
35 date: Mon Jan 12 13:46:40 1970 +0000 |
35 date: Mon Jan 12 13:46:40 1970 +0000 |
36 summary: 2 |
36 summary: 2 |
37 |
37 |
38 resolving manifests |
38 resolving manifests |
39 overwrite False partial False |
39 overwrite False partial False |
40 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
40 ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b |
41 a: versions differ -> m |
41 a: versions differ -> m |
42 b: other deleted -> r |
42 b: other deleted -> r |
43 preserving a for resolve of a |
43 preserving a for resolve of a |
44 removing b |
44 removing b |
45 picked tool 'true' for a (binary False symlink False) |
45 picked tool 'true' for a (binary False symlink False) |
57 changeset: 0:33aaa84a386b |
57 changeset: 0:33aaa84a386b |
58 user: test |
58 user: test |
59 date: Mon Jan 12 13:46:40 1970 +0000 |
59 date: Mon Jan 12 13:46:40 1970 +0000 |
60 summary: 1 |
60 summary: 1 |
61 |
61 |
|
62 searching for copies back to rev 1 |
|
63 unmatched files in other: |
|
64 b |
62 resolving manifests |
65 resolving manifests |
63 overwrite False partial False |
66 overwrite False partial False |
64 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
67 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
65 searching for copies back to rev 1 |
|
66 unmatched files in other: |
|
67 b |
|
68 a: versions differ -> m |
68 a: versions differ -> m |
69 b: remote created -> g |
69 b: remote created -> g |
70 preserving a for resolve of a |
70 preserving a for resolve of a |
71 picked tool 'true' for a (binary False symlink False) |
71 picked tool 'true' for a (binary False symlink False) |
72 merging a |
72 merging a |
113 |
113 |
114 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) |
114 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) |
115 failed |
115 failed |
116 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
116 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
117 failed |
117 failed |
|
118 searching for copies back to rev 1 |
118 resolving manifests |
119 resolving manifests |
119 overwrite False partial False |
120 overwrite False partial False |
120 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
121 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
121 searching for copies back to rev 1 |
|
122 a: versions differ -> m |
122 a: versions differ -> m |
123 b: versions differ -> m |
123 b: versions differ -> m |
124 preserving a for resolve of a |
124 preserving a for resolve of a |
125 preserving b for resolve of b |
125 preserving b for resolve of b |
126 picked tool 'true' for a (binary False symlink False) |
126 picked tool 'true' for a (binary False symlink False) |