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.
Showing
- mercurial/merge.py 21 additions, 4 deletionsmercurial/merge.py
- tests/test-copy-move-merge.t 2 additions, 2 deletionstests/test-copy-move-merge.t
- tests/test-double-merge.t 2 additions, 2 deletionstests/test-double-merge.t
- tests/test-graft.t 3 additions, 2 deletionstests/test-graft.t
- tests/test-issue672.t 2 additions, 2 deletionstests/test-issue672.t
- tests/test-lfconvert.t 1 addition, 1 deletiontests/test-lfconvert.t
- tests/test-merge-commit.t 2 additions, 2 deletionstests/test-merge-commit.t
- tests/test-merge-criss-cross.t 2 additions, 1 deletiontests/test-merge-criss-cross.t
- tests/test-merge-force.t 9 additions, 9 deletionstests/test-merge-force.t
- tests/test-merge-types.t 8 additions, 8 deletionstests/test-merge-types.t
- tests/test-merge7.t 2 additions, 1 deletiontests/test-merge7.t
- tests/test-merge9.t 2 additions, 2 deletionstests/test-merge9.t
- tests/test-rename-merge1.t 1 addition, 1 deletiontests/test-rename-merge1.t
- tests/test-rename-merge2.t 102 additions, 70 deletionstests/test-rename-merge2.t
- tests/test-status-color.t 1 addition, 1 deletiontests/test-status-color.t
- tests/test-subrepo.t 4 additions, 3 deletionstests/test-subrepo.t
- tests/test-up-local-change.t 6 additions, 3 deletionstests/test-up-local-change.t
Loading
Please register or sign in to comment