Mercurial > hg-stable
comparison tests/test-issue672.t @ 48472:38941a28406a
mergestate: merge `preresolve()` into `resolve()`
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
Differential Revision: https://phab.mercurial-scm.org/D11855
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 02 Dec 2021 22:59:36 -0800 |
| parents | 69429972ff1f |
| children | 55c6ebd11cb9 |
comparison
equal
deleted
inserted
replaced
| 48471:de8181c5414d | 48472:38941a28406a |
|---|---|
| 63 resolving manifests | 63 resolving manifests |
| 64 branchmerge: True, force: False, partial: False | 64 branchmerge: True, force: False, partial: False |
| 65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 | 65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 |
| 66 starting 4 threads for background file closing (?) | 66 starting 4 threads for background file closing (?) |
| 67 preserving 1a for resolve of 1a | 67 preserving 1a for resolve of 1a |
| 68 1a: local copied/moved from 1 -> m (premerge) | 68 1a: local copied/moved from 1 -> m |
| 69 picked tool ':merge' for 1a (binary False symlink False changedelete False) | 69 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
| 70 merging 1a and 1 to 1a | 70 merging 1a and 1 to 1a |
| 71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 | 71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 |
| 72 premerge successful | 72 premerge successful |
| 73 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 87 branchmerge: True, force: False, partial: False | 87 branchmerge: True, force: False, partial: False |
| 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b | 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b |
| 89 starting 4 threads for background file closing (?) | 89 starting 4 threads for background file closing (?) |
| 90 preserving 1 for resolve of 1a | 90 preserving 1 for resolve of 1a |
| 91 removing 1 | 91 removing 1 |
| 92 1a: remote moved from 1 -> m (premerge) | 92 1a: remote moved from 1 -> m |
| 93 picked tool ':merge' for 1a (binary False symlink False changedelete False) | 93 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
| 94 merging 1 and 1a to 1a | 94 merging 1 and 1a to 1a |
| 95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 | 95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 |
| 96 premerge successful | 96 premerge successful |
| 97 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 97 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |