filemerge: break overall filemerge into separate premerge and merge steps
This means that in ms.resolve we must call merge after calling premerge. This doesn't yet mean that all premerges happen before any merges -- however, this does get us closer to our goal. The output differences are because we recompute the merge tool. The only user-visible difference caused by this patch is that if the tool is missing we'll print the warning twice. Not a huge deal, though.
Showing
- mercurial/filemerge.py 3 additions, 3 deletionsmercurial/filemerge.py
- mercurial/merge.py 5 additions, 2 deletionsmercurial/merge.py
- tests/test-graft.t 2 additions, 0 deletionstests/test-graft.t
- tests/test-merge-criss-cross.t 2 additions, 0 deletionstests/test-merge-criss-cross.t
- tests/test-merge-tools.t 2 additions, 0 deletionstests/test-merge-tools.t
- tests/test-merge7.t 2 additions, 0 deletionstests/test-merge7.t
- tests/test-rename-merge2.t 65 additions, 1 deletiontests/test-rename-merge2.t
- tests/test-subrepo.t 2 additions, 0 deletionstests/test-subrepo.t
- tests/test-up-local-change.t 9 additions, 3 deletionstests/test-up-local-change.t
Loading
Please register or sign in to comment