equal
deleted
inserted
replaced
218 update to 2:4bc80088dc6b |
218 update to 2:4bc80088dc6b |
219 resolving manifests |
219 resolving manifests |
220 branchmerge: False, force: True, partial: False |
220 branchmerge: False, force: True, partial: False |
221 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
221 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
222 f2.txt: other deleted -> r |
222 f2.txt: other deleted -> r |
223 f1.txt: remote created -> g |
|
224 removing f2.txt |
223 removing f2.txt |
225 updating: f2.txt 1/2 files (50.00%) |
224 updating: f2.txt 1/2 files (50.00%) |
|
225 f1.txt: remote created -> g |
226 getting f1.txt |
226 getting f1.txt |
227 updating: f1.txt 2/2 files (100.00%) |
227 updating: f1.txt 2/2 files (100.00%) |
228 merge against 9:e31216eec445 |
228 merge against 9:e31216eec445 |
229 detach base 8:8e4e2c1a07ae |
229 detach base 8:8e4e2c1a07ae |
230 searching for copies back to rev 3 |
230 searching for copies back to rev 3 |
253 update back to initial working directory parent |
253 update back to initial working directory parent |
254 resolving manifests |
254 resolving manifests |
255 branchmerge: False, force: False, partial: False |
255 branchmerge: False, force: False, partial: False |
256 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
256 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
257 f1.txt: other deleted -> r |
257 f1.txt: other deleted -> r |
258 f2.txt: remote created -> g |
|
259 removing f1.txt |
258 removing f1.txt |
260 updating: f1.txt 1/2 files (50.00%) |
259 updating: f1.txt 1/2 files (50.00%) |
|
260 f2.txt: remote created -> g |
261 getting f2.txt |
261 getting f2.txt |
262 updating: f2.txt 2/2 files (100.00%) |
262 updating: f2.txt 2/2 files (100.00%) |
263 3 changesets found |
263 3 changesets found |
264 list of changesets: |
264 list of changesets: |
265 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
265 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |