D11855: mergestate: merge `preresolve()` into `resolve()`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Dec 4 07:10:24 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b <https://phab.mercurial-scm.org/rHG32ce4cbaec4b46b826fccfee12a3060e202af1cf> (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11855
AFFECTED FILES
mercurial/commands.py
mercurial/merge.py
mercurial/mergestate.py
tests/test-copy-move-merge.t
tests/test-double-merge.t
tests/test-graft.t
tests/test-issue672.t
tests/test-merge-commit.t
tests/test-merge-criss-cross.t
tests/test-merge-force.t
tests/test-merge-halt.t
tests/test-merge-types.t
tests/test-merge7.t
tests/test-merge9.t
tests/test-rename-merge1.t
tests/test-rename-merge2.t
tests/test-resolve.t
tests/test-shelve.t
tests/test-sparse-profiles.t
tests/test-status-color.t
tests/test-subrepo.t
tests/test-up-local-change.t
CHANGE DETAILS
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -46,11 +46,10 @@
b: remote created -> g
getting b
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
- a: versions differ -> m (merge)
picked tool 'true' for a (binary False symlink False changedelete False)
my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
@@ -72,11 +71,10 @@
removing b
starting 4 threads for background file closing (?)
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a at 1e71731e6fbb+ other a at c19d34741b0a ancestor a at 1e71731e6fbb
- a: versions differ -> m (merge)
picked tool 'true' for a (binary False symlink False changedelete False)
my a at 1e71731e6fbb+ other a at c19d34741b0a ancestor a at 1e71731e6fbb
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
@@ -95,11 +93,10 @@
b: remote created -> g
getting b
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
- a: versions differ -> m (merge)
picked tool 'true' for a (binary False symlink False changedelete False)
my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -278,7 +278,7 @@
branchmerge: True, force: False, partial: False
ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
starting 4 threads for background file closing (?)
- .hgsubstate: versions differ -> m (premerge)
+ .hgsubstate: versions differ -> m
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
getting subrepo t
@@ -304,7 +304,7 @@
branchmerge: True, force: False, partial: False
ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
starting 4 threads for background file closing (?)
- .hgsubstate: versions differ -> m (premerge)
+ .hgsubstate: versions differ -> m
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
subrepo t: both sides changed
subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
@@ -317,11 +317,10 @@
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
starting 4 threads for background file closing (?)
preserving t for resolve of t
- t: versions differ -> m (premerge)
+ t: versions differ -> m
picked tool ':merge' for t (binary False symlink False changedelete False)
merging t
my t at 20a0db6fbf6c+ other t at 7af322bc1198 ancestor t at 6747d179aa9a
- t: versions differ -> m (merge)
picked tool ':merge' for t (binary False symlink False changedelete False)
my t at 20a0db6fbf6c+ other t at 7af322bc1198 ancestor t at 6747d179aa9a
warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -375,8 +375,8 @@
created new head
$ hg merge
merging a
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
merging b
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
diff --git a/tests/test-sparse-profiles.t b/tests/test-sparse-profiles.t
--- a/tests/test-sparse-profiles.t
+++ b/tests/test-sparse-profiles.t
@@ -128,8 +128,8 @@
$ hg merge 1
temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse
+ warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
merging data.py
- warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -197,8 +197,8 @@
rebasing 1:a2b1de640a62 "edit profile"
temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse
+ warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
merging data.py
- warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1385,8 +1385,8 @@
unshelving change 'default-01'
rebasing shelved changes
merging bar1
+ warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
merging bar2
- warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[240]
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -196,8 +196,8 @@
resolve --all should re-merge all unresolved files
$ hg resolve --all
merging file1
+ warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
merging file2
- warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
[1]
$ cat file1.orig
@@ -211,8 +211,8 @@
$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
merging file1
creating directory: $TESTTMP/repo/.hg/origbackups
+ warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
merging file2
- warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
[1]
$ ls .hg/origbackups
@@ -478,10 +478,10 @@
$ hg rebase -s 1 -d 2
rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
merging emp1
+ warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
merging emp2
+ warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
merging emp3
- warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
@@ -490,10 +490,10 @@
===========================================================
$ hg resolve --all
merging emp1
+ warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
merging emp2
+ warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
merging emp3
- warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
[1]
@@ -522,10 +522,10 @@
> EOF
re-merge all unresolved files (yn)? y
merging emp1
+ warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
merging emp2
+ warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
merging emp3
- warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
[1]
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -88,16 +88,15 @@
starting 4 threads for background file closing (?)
preserving a for resolve of b
preserving rev for resolve of rev
- b: remote copied from a -> m (premerge)
+ b: remote copied from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b at e300d1c794ec+ other b at 4ce40f5aca24 ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -128,16 +127,15 @@
getting a
preserving b for resolve of b
preserving rev for resolve of rev
- b: local copied/moved from a -> m (premerge)
+ b: local copied/moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b at 86a2aa42fc76+ other a at f4db7e329e71 ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 86a2aa42fc76+ other rev at f4db7e329e71 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 86a2aa42fc76+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -168,16 +166,15 @@
preserving a for resolve of b
preserving rev for resolve of rev
removing a
- b: remote moved from a -> m (premerge)
+ b: remote moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b at e300d1c794ec+ other b at bdb19105162a ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at e300d1c794ec+ other rev at bdb19105162a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at e300d1c794ec+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -206,16 +203,15 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: local copied/moved from a -> m (premerge)
+ b: local copied/moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b at 02963e448370+ other a at f4db7e329e71 ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 02963e448370+ other rev at f4db7e329e71 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 02963e448370+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -244,11 +240,10 @@
b: remote created -> g
getting b
preserving rev for resolve of rev
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 94b33a1b7f2d+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 94b33a1b7f2d+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -276,11 +271,10 @@
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
starting 4 threads for background file closing (?)
preserving rev for resolve of rev
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 86a2aa42fc76+ other rev at 97c705ade336 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 86a2aa42fc76+ other rev at 97c705ade336 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -311,11 +305,10 @@
b: remote created -> g
getting b
preserving rev for resolve of rev
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 94b33a1b7f2d+ other rev at bdb19105162a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 94b33a1b7f2d+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -342,11 +335,10 @@
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
starting 4 threads for background file closing (?)
preserving rev for resolve of rev
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 02963e448370+ other rev at 97c705ade336 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 02963e448370+ other rev at 97c705ade336 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -374,20 +366,18 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 62e7bf090eba+ other b at 49b6d8032493 ancestor a at 924404dff337
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
- b: both renamed from a -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at 62e7bf090eba+ other b at 49b6d8032493 ancestor a at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -425,11 +415,10 @@
c: remote created -> g
getting c
preserving rev for resolve of rev
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 02963e448370+ other rev at fe905ef2c33e ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 02963e448370+ other rev at fe905ef2c33e ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -456,20 +445,18 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both created -> m (premerge)
+ b: both created -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 86a2aa42fc76+ other b at af30c7647fc7 ancestor b at 000000000000
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
- b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at 86a2aa42fc76+ other b at af30c7647fc7 ancestor b at 000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -498,20 +485,18 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both created -> m (premerge)
+ b: both created -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
- b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -538,16 +523,15 @@
getting a
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 86a2aa42fc76+ other b at 8dbce441892a ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -576,20 +560,18 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both created -> m (premerge)
+ b: both created -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
- b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -616,16 +598,15 @@
getting a
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 86a2aa42fc76+ other b at 8dbce441892a ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -652,16 +633,15 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 0b76e65c8289+ other b at 4ce40f5aca24 ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 0b76e65c8289+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 0b76e65c8289+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -688,16 +668,15 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 02963e448370+ other b at 8dbce441892a ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 02963e448370+ other rev at 8dbce441892a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 02963e448370+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -723,16 +702,15 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: both renamed from a -> m (premerge)
+ b: both renamed from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b at 0b76e65c8289+ other b at bdb19105162a ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 0b76e65c8289+ other rev at bdb19105162a ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 0b76e65c8289+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -762,20 +740,18 @@
preserving a for resolve of b
preserving rev for resolve of rev
removing a
- b: remote moved from a -> m (premerge)
+ b: remote moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b at e300d1c794ec+ other b at 49b6d8032493 ancestor a at 924404dff337
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
- b: remote moved from a -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at e300d1c794ec+ other b at 49b6d8032493 ancestor a at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -804,20 +780,18 @@
starting 4 threads for background file closing (?)
preserving b for resolve of b
preserving rev for resolve of rev
- b: local copied/moved from a -> m (premerge)
+ b: local copied/moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b at 62e7bf090eba+ other a at f4db7e329e71 ancestor a at 924404dff337
- rev: versions differ -> m (premerge)
- picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
- merging rev
- my rev at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
- b: local copied/moved from a -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b at 62e7bf090eba+ other a at f4db7e329e71 ancestor a at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
- rev: versions differ -> m (merge)
+ rev: versions differ -> m
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
+ merging rev
+ my rev at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -852,16 +826,15 @@
getting c
preserving b for resolve of b
preserving rev for resolve of rev
- b: local copied/moved from a -> m (premerge)
+ b: local copied/moved from a -> m
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b at 02963e448370+ other a at 2b958612230f ancestor a at 924404dff337
premerge successful
- rev: versions differ -> m (premerge)
+ rev: versions differ -> m
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev at 02963e448370+ other rev at 2b958612230f ancestor rev at 924404dff337
- rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev at 02963e448370+ other rev at 2b958612230f ancestor rev at 924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -44,7 +44,7 @@
getting b2
preserving a for resolve of b
removing a
- b: remote moved from a -> m (premerge)
+ b: remote moved from a -> m
picked tool ':merge' for b (binary False symlink False changedelete False)
merging a and b to b
my b at 044f8520aeeb+ other b at 85c198ef2f6c ancestor a at af1939970a1c
@@ -218,7 +218,7 @@
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
starting 4 threads for background file closing (?)
preserving z for resolve of z
- z: both renamed from y -> m (premerge)
+ z: both renamed from y -> m
picked tool ':merge3' for z (binary False symlink False changedelete False)
merging z
my z at 07fcbc9a74ed+ other z at f21419739508 ancestor y at 5151c134577e
diff --git a/tests/test-merge9.t b/tests/test-merge9.t
--- a/tests/test-merge9.t
+++ b/tests/test-merge9.t
@@ -27,8 +27,8 @@
test with the rename on the remote side
$ HGMERGE=false hg merge
merging bar
+ merging bar failed!
merging foo and baz to baz
- merging bar failed!
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
@@ -41,8 +41,8 @@
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ HGMERGE=false hg merge
merging bar
+ merging bar failed!
merging baz and foo to baz
- merging bar failed!
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -86,11 +86,10 @@
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
starting 4 threads for background file closing (?)
preserving test.txt for resolve of test.txt
- test.txt: versions differ -> m (premerge)
+ test.txt: versions differ -> m
picked tool ':merge' for test.txt (binary False symlink False changedelete False)
merging test.txt
my test.txt at 50c3a7e29886+ other test.txt at 40d11a4173a8 ancestor test.txt at 96b70246a118
- test.txt: versions differ -> m (merge)
picked tool ':merge' for test.txt (binary False symlink False changedelete False)
my test.txt at 50c3a7e29886+ other test.txt at 40d11a4173a8 ancestor test.txt at 96b70246a118
warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -34,7 +34,7 @@
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
tool internal:merge (for pattern a) can't handle symlinks
couldn't find merge tool hgmerge
no tool found to merge a
@@ -68,7 +68,7 @@
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool ':union' for a (binary False symlink True changedelete False)
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
@@ -90,7 +90,7 @@
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool ':merge3' for a (binary False symlink True changedelete False)
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
@@ -112,7 +112,7 @@
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool ':merge-local' for a (binary False symlink True changedelete False)
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
@@ -133,7 +133,7 @@
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
picked tool ':merge-other' for a (binary False symlink True changedelete False)
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
@@ -166,7 +166,7 @@
branchmerge: False, force: False, partial: False
ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
preserving a for resolve of a
- a: versions differ -> m (premerge)
+ a: versions differ -> m
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
no tool found to merge a
picked tool ':prompt' for a (binary False symlink True changedelete False)
@@ -343,9 +343,12 @@
$ hg merge
merging a
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for b without common ancestor - keeping local flags
merging b
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
merging bx
+ warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for c without common ancestor - keeping local flags
tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d
@@ -362,9 +365,6 @@
file 'h' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 6 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
@@ -411,9 +411,12 @@
$ hg up -Cqr1
$ hg merge
merging a
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for b without common ancestor - keeping local flags
merging b
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
merging bx
+ warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for c without common ancestor - keeping local flags
tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d
@@ -430,9 +433,6 @@
file 'h' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 6 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt.t
--- a/tests/test-merge-halt.t
+++ b/tests/test-merge-halt.t
@@ -24,8 +24,8 @@
$ hg rebase -s 1 -d 2 --tool false
rebasing 1:1f28a51c3c9b "c"
merging a
+ merging a failed!
merging b
- merging a failed!
merging b failed!
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
@@ -42,7 +42,6 @@
$ hg rebase -s 1 -d 2 --tool false
rebasing 1:1f28a51c3c9b "c"
merging a
- merging b
merging a failed!
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
@@ -67,9 +66,9 @@
> EOS
rebasing 1:1f28a51c3c9b "c"
merging a
- merging b
merging a failed!
continue merge operation (yn)? y
+ merging b
merging b failed!
continue merge operation (yn)? n
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -94,9 +93,9 @@
> EOS
rebasing 1:1f28a51c3c9b "c"
merging a
- merging b
output file a appears unchanged
was merge successful (yn)? y
+ merging b
output file b appears unchanged
was merge successful (yn)? n
merging b failed!
@@ -122,7 +121,6 @@
$ hg rebase -s 1 -d 2 --tool true
rebasing 1:1f28a51c3c9b "c"
merging a
- merging b
merging a failed!
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
@@ -141,8 +139,8 @@
> EOS
rebasing 1:1f28a51c3c9b "c"
merging a
+ was merge of 'a' successful (yn)? y
merging b
- was merge of 'a' successful (yn)? y
was merge of 'b' successful (yn)? n
merging b failed!
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -159,8 +157,8 @@
$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
rebasing 1:1f28a51c3c9b "c"
merging a
+ $TESTTMP/repo/a *a~base* *a~other* (glob)
merging b
- $TESTTMP/repo/a *a~base* *a~other* (glob)
$TESTTMP/repo/b *b~base* *b~other* (glob)
Check that unshelve isn't broken by halting the merge
@@ -187,7 +185,6 @@
unshelving change 'default'
rebasing shelved changes
merging shelve_file1
- merging shelve_file2
merging shelve_file1 failed!
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[240]
@@ -195,7 +192,6 @@
M shelve_file1
M shelve_file2
? shelve_file1.orig
- ? shelve_file2.orig
# The repository is in an unfinished *unshelve* state.
# Unresolved merge conflicts:
@@ -210,7 +206,6 @@
$ hg resolve --tool false --all --re-merge
merging shelve_file1
- merging shelve_file2
merging shelve_file1 failed!
merge halted after failed merge (see hg resolve)
[240]
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -218,27 +218,27 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content1_content4-tracked
+ warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content2_content1-tracked
merging content1_content2_content2_content4-tracked
+ warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content1-tracked
merging content1_content2_content3_content3-tracked
+ warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content4-tracked
+ warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_missing_content1-tracked
merging content1_content2_missing_content4-tracked
+ warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content2_content4-tracked
+ warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content3-tracked
+ warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content4-tracked
+ warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-tracked
+ warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-untracked
- warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
18 files updated, 3 files merged, 8 files removed, 35 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -735,6 +735,7 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content1_content4-tracked
+ warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
@@ -752,6 +753,7 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content2_content4-tracked
+ warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
@@ -769,10 +771,12 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content3_content3-tracked
+ warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content3_content4-tracked
+ warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
@@ -790,6 +794,7 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_missing_content4-tracked
+ warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
@@ -812,19 +817,14 @@
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
merging missing_content2_content2_content4-tracked
+ warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content3-tracked
+ warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content4-tracked
+ warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-tracked
+ warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-untracked
- warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
[1]
$ checkstatus > $TESTTMP/status2 2>&1
diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -93,11 +93,10 @@
f1: remote is newer -> g
getting f1
preserving f2 for resolve of f2
- f2: versions differ -> m (premerge)
+ f2: versions differ -> m
picked tool ':dump' for f2 (binary False symlink False changedelete False)
merging f2
my f2 at 3b08d01b0ab5+ other f2 at adfe50279922 ancestor f2 at 0f6b37dbe527
- f2: versions differ -> m (merge)
picked tool ':dump' for f2 (binary False symlink False changedelete False)
my f2 at 3b08d01b0ab5+ other f2 at adfe50279922 ancestor f2 at 0f6b37dbe527
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -72,7 +72,7 @@
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
starting 4 threads for background file closing (?)
preserving bar for resolve of bar
- bar: versions differ -> m (premerge)
+ bar: versions differ -> m
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar
my bar at 2263c1be0967+ other bar at 0555950ead28 ancestor bar at 0f2ff26688b9
@@ -159,7 +159,7 @@
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
starting 4 threads for background file closing (?)
preserving bar for resolve of bar
- bar: versions differ -> m (premerge)
+ bar: versions differ -> m
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar
my bar at 2263c1be0967+ other bar at 3ffa6b9e35f0 ancestor bar at 0f2ff26688b9
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -65,7 +65,7 @@
ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
starting 4 threads for background file closing (?)
preserving 1a for resolve of 1a
- 1a: local copied/moved from 1 -> m (premerge)
+ 1a: local copied/moved from 1 -> m
picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a
my 1a at f4a9cff3cd0b+ other 1 at 746e9549ea96 ancestor 1 at c64f439569a9
@@ -89,7 +89,7 @@
starting 4 threads for background file closing (?)
preserving 1 for resolve of 1a
removing 1
- 1a: remote moved from 1 -> m (premerge)
+ 1a: remote moved from 1 -> m
picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a
my 1a at 746e9549ea96+ other 1a at f4a9cff3cd0b ancestor 1 at c64f439569a9
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -212,7 +212,7 @@
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
starting 4 threads for background file closing (?)
preserving b for resolve of b
- b: local copied/moved from a -> m (premerge)
+ b: local copied/moved from a -> m
picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b at ef0ef43d49e7+ other a at 5d205f8b35b6 ancestor a at 68795b066622
@@ -242,11 +242,10 @@
d: remote is newer -> g
getting d
preserving e for resolve of e
- e: versions differ -> m (premerge)
+ e: versions differ -> m
picked tool ':merge' for e (binary False symlink False changedelete False)
merging e
my e at 1905859650ec+ other e at 9c233e8e184d ancestor e at 4c60f11aa304
- e: versions differ -> m (merge)
picked tool ':merge' for e (binary False symlink False changedelete False)
my e at 1905859650ec+ other e at 9c233e8e184d ancestor e at 4c60f11aa304
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
@@ -855,8 +854,8 @@
$ hg graft -r 6 --base 5
grafting 6:25a2b029d3ae "6"
merging d
+ warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
merging e
- warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[1]
diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t
--- a/tests/test-double-merge.t
+++ b/tests/test-double-merge.t
@@ -38,12 +38,12 @@
starting 4 threads for background file closing (?)
preserving foo for resolve of bar
preserving foo for resolve of foo
- bar: remote copied from foo -> m (premerge)
+ bar: remote copied from foo -> m
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging foo and bar to bar
my bar at 6a0df1dad128+ other bar at 484bf6903104 ancestor foo at e6dc8efe11cc
premerge successful
- foo: versions differ -> m (premerge)
+ foo: versions differ -> m
picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo
my foo at 6a0df1dad128+ other foo at 484bf6903104 ancestor foo at e6dc8efe11cc
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -104,12 +104,12 @@
preserving a for resolve of b
preserving a for resolve of c
removing a
- b: remote moved from a -> m (premerge)
+ b: remote moved from a -> m
picked tool ':merge' for b (binary False symlink False changedelete False)
merging a and b to b
my b at add3f11052fa+ other b at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
premerge successful
- c: remote moved from a -> m (premerge)
+ c: remote moved from a -> m
picked tool ':merge' for c (binary False symlink False changedelete False)
merging a and c to c
my c at add3f11052fa+ other c at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -408,17 +408,14 @@
return complete, merge_ret
- def preresolve(self, dfile, wctx):
- """run premerge process for dfile
-
- Returns whether the merge is complete, and the exit code."""
- return self._resolve(True, dfile, wctx)
-
def resolve(self, dfile, wctx):
- """run merge process (assuming premerge was run) for dfile
+ """run merge process for dfile
Returns the exit code of the merge."""
- return self._resolve(False, dfile, wctx)[1]
+ complete, r = self._resolve(True, dfile, wctx)
+ if not complete:
+ r = self._resolve(False, dfile, wctx)[1]
+ return r
def counts(self):
"""return counts for updated, merged and removed files in this
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1718,10 +1718,8 @@
)
try:
- # premerge
- tocomplete = []
for f, args, msg in mergeactions:
- repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))
+ repo.ui.debug(b" %s: %s -> m\n" % (f, msg))
ms.addcommitinfo(f, {b'merged': b'yes'})
progress.increment(item=f)
if f == b'.hgsubstate': # subrepo states need updating
@@ -1730,16 +1728,6 @@
)
continue
wctx[f].audit()
- complete, r = ms.preresolve(f, wctx)
- if not complete:
- numupdates += 1
- tocomplete.append((f, args, msg))
-
- # merge
- for f, args, msg in tocomplete:
- repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))
- ms.addcommitinfo(f, {b'merged': b'yes'})
- progress.increment(item=f, total=numupdates)
ms.resolve(f, wctx)
except error.InterventionRequired:
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6130,7 +6130,6 @@
ret = 0
didwork = False
- tocomplete = []
hasconflictmarkers = []
if mark:
markcheck = ui.config(b'commands', b'resolve.mark-check')
@@ -6183,24 +6182,20 @@
# preresolve file
overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
with ui.configoverride(overrides, b'resolve'):
- complete, r = ms.preresolve(f, wctx)
- if not complete:
- tocomplete.append(f)
- elif r:
+ r = ms.resolve(f, wctx)
+ if r:
ret = 1
finally:
ms.commit()
- # replace filemerge's .orig file with our resolve file, but only
- # for merges that are complete
- if complete:
- try:
- util.rename(
- a + b".resolve", scmutil.backuppath(ui, repo, f)
- )
- except OSError as inst:
- if inst.errno != errno.ENOENT:
- raise
+ # replace filemerge's .orig file with our resolve file
+ try:
+ util.rename(
+ a + b".resolve", scmutil.backuppath(ui, repo, f)
+ )
+ except OSError as inst:
+ if inst.errno != errno.ENOENT:
+ raise
if hasconflictmarkers:
ui.warn(
@@ -6218,25 +6213,6 @@
hint=_(b'use --all to mark anyway'),
)
- for f in tocomplete:
- try:
- # resolve file
- overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
- with ui.configoverride(overrides, b'resolve'):
- r = ms.resolve(f, wctx)
- if r:
- ret = 1
- finally:
- ms.commit()
-
- # replace filemerge's .orig file with our resolve file
- a = repo.wjoin(f)
- try:
- util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
- except OSError as inst:
- if inst.errno != errno.ENOENT:
- raise
-
ms.commit()
branchmerge = repo.dirstate.p2() != repo.nullid
# resolve is not doing a parent change here, however, `record updates`
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list