Mercurial > hg
comparison tests/test-merge7.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 | 296d55def9c4 |
comparison
equal
deleted
inserted
replaced
| 26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
|---|---|
| 82 searching for copies back to rev 1 | 82 searching for copies back to rev 1 |
| 83 resolving manifests | 83 resolving manifests |
| 84 branchmerge: True, force: False, partial: False | 84 branchmerge: True, force: False, partial: False |
| 85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 | 85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
| 86 preserving test.txt for resolve of test.txt | 86 preserving test.txt for resolve of test.txt |
| 87 test.txt: versions differ -> m | 87 test.txt: versions differ -> m (premerge) |
| 88 picked tool ':merge' for test.txt (binary False symlink False) | 88 picked tool ':merge' for test.txt (binary False symlink False) |
| 89 merging test.txt | 89 merging test.txt |
| 90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | 90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
| 91 test.txt: versions differ -> m (merge) | |
| 91 picked tool ':merge' for test.txt (binary False symlink False) | 92 picked tool ':merge' for test.txt (binary False symlink False) |
| 92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | 93 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
| 93 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') | 94 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
| 94 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 95 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 95 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 96 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |