equal
deleted
inserted
replaced
42 $ hg --debug up |
42 $ hg --debug up |
43 searching for copies back to rev 1 |
43 searching for copies back to rev 1 |
44 unmatched files in other: |
44 unmatched files in other: |
45 b |
45 b |
46 resolving manifests |
46 resolving manifests |
47 overwrite: False, partial: False |
47 branchmerge: False, force: False, partial: False |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
49 a: versions differ -> m |
49 a: versions differ -> m |
50 preserving a for resolve of a |
50 preserving a for resolve of a |
51 b: remote created -> g |
51 b: remote created -> g |
52 updating: a 1/2 files (50.00%) |
52 updating: a 1/2 files (50.00%) |
63 date: Thu Jan 01 00:00:00 1970 +0000 |
63 date: Thu Jan 01 00:00:00 1970 +0000 |
64 summary: 2 |
64 summary: 2 |
65 |
65 |
66 $ hg --debug up 0 |
66 $ hg --debug up 0 |
67 resolving manifests |
67 resolving manifests |
68 overwrite: False, partial: False |
68 branchmerge: False, force: False, partial: False |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
70 b: other deleted -> r |
70 b: other deleted -> r |
71 a: versions differ -> m |
71 a: versions differ -> m |
72 preserving a for resolve of a |
72 preserving a for resolve of a |
73 updating: b 1/2 files (50.00%) |
73 updating: b 1/2 files (50.00%) |
96 $ hg --debug up |
96 $ hg --debug up |
97 searching for copies back to rev 1 |
97 searching for copies back to rev 1 |
98 unmatched files in other: |
98 unmatched files in other: |
99 b |
99 b |
100 resolving manifests |
100 resolving manifests |
101 overwrite: False, partial: False |
101 branchmerge: False, force: False, partial: False |
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
103 a: versions differ -> m |
103 a: versions differ -> m |
104 preserving a for resolve of a |
104 preserving a for resolve of a |
105 b: remote created -> g |
105 b: remote created -> g |
106 updating: a 1/2 files (50.00%) |
106 updating: a 1/2 files (50.00%) |
174 (use 'hg status' to list changes) |
174 (use 'hg status' to list changes) |
175 [255] |
175 [255] |
176 $ hg --debug merge -f |
176 $ hg --debug merge -f |
177 searching for copies back to rev 1 |
177 searching for copies back to rev 1 |
178 resolving manifests |
178 resolving manifests |
179 overwrite: False, partial: False |
179 branchmerge: True, force: True, partial: False |
180 ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
180 ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
181 a: versions differ -> m |
181 a: versions differ -> m |
182 preserving a for resolve of a |
182 preserving a for resolve of a |
183 b: versions differ -> m |
183 b: versions differ -> m |
184 preserving b for resolve of b |
184 preserving b for resolve of b |