Mercurial > hg-stable
comparison tests/test-merge-types.t @ 26618:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 21:56:39 -0700 |
| parents | ef1eb6df7071 |
| children | 4b966aaadc45 |
comparison
equal
deleted
inserted
replaced
| 26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
|---|---|
| 33 searching for copies back to rev 1 | 33 searching for copies back to rev 1 |
| 34 resolving manifests | 34 resolving manifests |
| 35 branchmerge: True, force: False, partial: False | 35 branchmerge: True, force: False, partial: False |
| 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c | 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
| 37 preserving a for resolve of a | 37 preserving a for resolve of a |
| 38 a: versions differ -> m | 38 a: versions differ -> m (premerge) |
| 39 picked tool ':merge' for a (binary False symlink True) | 39 picked tool ':merge' for a (binary False symlink True) |
| 40 merging a | 40 merging a |
| 41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da | 41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
| 42 warning: internal :merge cannot merge symlinks for a | 42 warning: internal :merge cannot merge symlinks for a |
| 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 66 searching for copies back to rev 1 | 66 searching for copies back to rev 1 |
| 67 resolving manifests | 67 resolving manifests |
| 68 branchmerge: True, force: False, partial: False | 68 branchmerge: True, force: False, partial: False |
| 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 70 preserving a for resolve of a | 70 preserving a for resolve of a |
| 71 a: versions differ -> m | 71 a: versions differ -> m (premerge) |
| 72 picked tool ':union' for a (binary False symlink True) | 72 picked tool ':union' for a (binary False symlink True) |
| 73 merging a | 73 merging a |
| 74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 75 warning: internal :union cannot merge symlinks for a | 75 warning: internal :union cannot merge symlinks for a |
| 76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 89 searching for copies back to rev 1 | 89 searching for copies back to rev 1 |
| 90 resolving manifests | 90 resolving manifests |
| 91 branchmerge: True, force: False, partial: False | 91 branchmerge: True, force: False, partial: False |
| 92 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 92 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 93 preserving a for resolve of a | 93 preserving a for resolve of a |
| 94 a: versions differ -> m | 94 a: versions differ -> m (premerge) |
| 95 picked tool ':merge3' for a (binary False symlink True) | 95 picked tool ':merge3' for a (binary False symlink True) |
| 96 merging a | 96 merging a |
| 97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 98 warning: internal :merge3 cannot merge symlinks for a | 98 warning: internal :merge3 cannot merge symlinks for a |
| 99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 122 searching for copies back to rev 2 | 122 searching for copies back to rev 2 |
| 123 resolving manifests | 123 resolving manifests |
| 124 branchmerge: False, force: False, partial: False | 124 branchmerge: False, force: False, partial: False |
| 125 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f | 125 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
| 126 preserving a for resolve of a | 126 preserving a for resolve of a |
| 127 a: versions differ -> m | 127 a: versions differ -> m (premerge) |
| 128 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | 128 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
| 129 picked tool ':prompt' for a (binary False symlink True) | 129 picked tool ':prompt' for a (binary False symlink True) |
| 130 no tool found to merge a | 130 no tool found to merge a |
| 131 keep (l)ocal or take (o)ther? l | 131 keep (l)ocal or take (o)ther? l |
| 132 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 132 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 281 $ ln -s 2 h | 281 $ ln -s 2 h |
| 282 $ hg ci -Aqm2 | 282 $ hg ci -Aqm2 |
| 283 | 283 |
| 284 $ hg merge | 284 $ hg merge |
| 285 merging a | 285 merging a |
| 286 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
| 287 warning: cannot merge flags for b | 286 warning: cannot merge flags for b |
| 288 merging b | 287 merging b |
| 289 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
| 290 warning: cannot merge flags for c | 288 warning: cannot merge flags for c |
| 291 merging d | 289 merging d |
| 292 warning: internal :merge cannot merge symlinks for d | 290 warning: internal :merge cannot merge symlinks for d |
| 293 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 291 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 294 merging f | 292 merging f |
| 295 warning: internal :merge cannot merge symlinks for f | 293 warning: internal :merge cannot merge symlinks for f |
| 296 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 294 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
| 297 merging h | 295 merging h |
| 298 warning: internal :merge cannot merge symlinks for h | 296 warning: internal :merge cannot merge symlinks for h |
| 299 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') | 297 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
| 298 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
| 299 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
| 300 3 files updated, 0 files merged, 0 files removed, 5 files unresolved | 300 3 files updated, 0 files merged, 0 files removed, 5 files unresolved |
| 301 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 301 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 302 [1] | 302 [1] |
| 303 $ hg resolve -l | 303 $ hg resolve -l |
| 304 U a | 304 U a |
| 340 h -> 2 | 340 h -> 2 |
| 341 | 341 |
| 342 $ hg up -Cqr1 | 342 $ hg up -Cqr1 |
| 343 $ hg merge | 343 $ hg merge |
| 344 merging a | 344 merging a |
| 345 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
| 346 warning: cannot merge flags for b | 345 warning: cannot merge flags for b |
| 347 merging b | 346 merging b |
| 348 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
| 349 warning: cannot merge flags for c | 347 warning: cannot merge flags for c |
| 350 merging d | 348 merging d |
| 351 warning: internal :merge cannot merge symlinks for d | 349 warning: internal :merge cannot merge symlinks for d |
| 352 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 350 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 353 merging f | 351 merging f |
| 354 warning: internal :merge cannot merge symlinks for f | 352 warning: internal :merge cannot merge symlinks for f |
| 355 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 353 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
| 356 merging h | 354 merging h |
| 357 warning: internal :merge cannot merge symlinks for h | 355 warning: internal :merge cannot merge symlinks for h |
| 358 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') | 356 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
| 357 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
| 358 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
| 359 3 files updated, 0 files merged, 0 files removed, 5 files unresolved | 359 3 files updated, 0 files merged, 0 files removed, 5 files unresolved |
| 360 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 360 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 361 [1] | 361 [1] |
| 362 $ tellmeabout a | 362 $ tellmeabout a |
| 363 a is a plain file with content: | 363 a is a plain file with content: |