equal
deleted
inserted
replaced
300 -------------- |
300 -------------- |
301 M b |
301 M b |
302 -------------- |
302 -------------- |
303 |
303 |
304 -------------- |
304 -------------- |
305 test L:nc a b R:up a b W: - 16 merge a, merge b no ancestor |
305 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
306 -------------- |
306 -------------- |
307 resolving manifests |
307 resolving manifests |
308 overwrite None branchmerge True partial False |
308 overwrite None branchmerge True partial False |
309 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 |
309 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 |
310 a: remote is newer -> g |
310 a: remote is newer -> g |
323 M a |
323 M a |
324 M b |
324 M b |
325 -------------- |
325 -------------- |
326 |
326 |
327 -------------- |
327 -------------- |
328 test L:up a b R:nc a b W: - 17 merge a, merge b no ancestor |
328 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
329 -------------- |
329 -------------- |
330 resolving manifests |
330 resolving manifests |
331 overwrite None branchmerge True partial False |
331 overwrite None branchmerge True partial False |
332 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 |
332 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 |
333 b: versions differ -> m |
333 b: versions differ -> m |
367 M a |
367 M a |
368 M b |
368 M b |
369 -------------- |
369 -------------- |
370 |
370 |
371 -------------- |
371 -------------- |
372 test L:up a b R:nm a b W: - 19 merge b no ancestor, remove a |
372 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
373 -------------- |
373 -------------- |
374 resolving manifests |
374 resolving manifests |
375 overwrite None branchmerge True partial False |
375 overwrite None branchmerge True partial False |
376 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 |
376 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 |
377 b: versions differ -> m |
377 b: versions differ -> m |