Mercurial > hg
comparison tests/test-merge-commit.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 | d8463a743d7d |
children | 296d55def9c4 |
comparison
equal
deleted
inserted
replaced
26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
---|---|
70 searching for copies back to rev 1 | 70 searching for copies back to rev 1 |
71 resolving manifests | 71 resolving manifests |
72 branchmerge: True, force: False, partial: False | 72 branchmerge: True, force: False, partial: False |
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 | 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
74 preserving bar for resolve of bar | 74 preserving bar for resolve of bar |
75 bar: versions differ -> m | 75 bar: versions differ -> m (premerge) |
76 picked tool ':merge' for bar (binary False symlink False) | 76 picked tool ':merge' for bar (binary False symlink False) |
77 merging bar | 77 merging bar |
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 | 78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
79 premerge successful | 79 premerge successful |
80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
156 searching for copies back to rev 1 | 156 searching for copies back to rev 1 |
157 resolving manifests | 157 resolving manifests |
158 branchmerge: True, force: False, partial: False | 158 branchmerge: True, force: False, partial: False |
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 | 159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
160 preserving bar for resolve of bar | 160 preserving bar for resolve of bar |
161 bar: versions differ -> m | 161 bar: versions differ -> m (premerge) |
162 picked tool ':merge' for bar (binary False symlink False) | 162 picked tool ':merge' for bar (binary False symlink False) |
163 merging bar | 163 merging bar |
164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 | 164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
165 premerge successful | 165 premerge successful |
166 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 166 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |