Mercurial > hg
comparison tests/test-merge-criss-cross.t @ 45488:c4f14db3da1d
merge: move initial handling of mergeactions near to later one
We build `mergeactions` in the beginning and use it in end. Let's build it just
before where it will be used. Helps making code much easier to understand.
Differential Revision: https://phab.mercurial-scm.org/D8983
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 03 Sep 2020 13:25:29 +0530 |
| parents | 49ffaa4f65f6 |
| children | 6877b0ee5f9d |
comparison
equal
deleted
inserted
replaced
| 45487:78f0bb37f52d | 45488:c4f14db3da1d |
|---|---|
| 76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 | 76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
| 77 alternatively, use --config merge.preferancestor=40663881a6dd | 77 alternatively, use --config merge.preferancestor=40663881a6dd |
| 78 resolving manifests | 78 resolving manifests |
| 79 branchmerge: True, force: False, partial: False | 79 branchmerge: True, force: False, partial: False |
| 80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 | 80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
| 81 preserving f2 for resolve of f2 | |
| 82 f1: remote is newer -> g | 81 f1: remote is newer -> g |
| 83 getting f1 | 82 getting f1 |
| 83 preserving f2 for resolve of f2 | |
| 84 f2: versions differ -> m (premerge) | 84 f2: versions differ -> m (premerge) |
| 85 picked tool ':dump' for f2 (binary False symlink False changedelete False) | 85 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
| 86 merging f2 | 86 merging f2 |
| 87 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 | 87 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
| 88 f2: versions differ -> m (merge) | 88 f2: versions differ -> m (merge) |