bisect: avoid copying ancestor list for non-merge commits
During a bisection, hg needs to compute a list of all ancestors for every
candidate commit. This is accomplished via a bottom-up traversal of the set of
candidates, during which each revision's ancestor list is populated using the
ancestor list of its parent(s). Previously, this involved copying the entire
list, which could be very long in if the bisection range was large.
To help improve this, we can observe that each candidate commit is visited
exactly once, at which point its ancestor list is copied into its children's
lists and then dropped. In the case of non-merge commits, a commit's ancestor
list consists exactly of its parent's list plus itself. This means that we can
trivially reuse the parent's existing list for one of its non-merge children,
which avoids copying entirely if that commit is the parent's only child. This
makes bisections over linear ranges of commits much faster.
During some informal testing in the large publicly-available `mozilla-central`
repository, this noticeably sped up bisections over large ranges of history:
Setup:
$ cd mozilla-central
$ hg bisect --reset
$ hg bisect --good 0
$ hg log -r tip -T '{rev}\n'
628417
Test:
$ time hg bisect --bad tip --noupdate
Before:
real 3m35.927s
user 3m35.553s
sys 0m0.319s
After:
real 1m41.142s
user 1m40.810s
sys 0m0.285s
#testcases newfilenode old
#if newfilenode
Enable the config option
------------------------
$ cat >> $HGRCPATH <<EOF
> [experimental]
> merge-track-salvaged = True
> EOF
#endif
Tests for change/delete conflicts, including:
b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
(issue897)
840e2b315c1f: Fix misleading error and prompts during update/merge
(issue556)
Make sure HGMERGE doesn't interfere with the test
$ unset HGMERGE
$ status() {
> echo "--- status ---"
> hg st -A file1 file2 file3
> echo "--- resolve --list ---"
> hg resolve --list file1 file2 file3
> echo "--- debugmergestate ---"
> hg debugmergestate
> for file in file1 file2 file3; do
> if [ -f $file ]; then
> echo "--- $file ---"
> cat $file
> else
> echo "*** $file does not exist"
> fi
> done
> }
$ hg init repo
$ cd repo
$ echo 1 > file1
$ echo 2 > file2
$ echo 3 > file3
$ hg ci -Am 'added files'
adding file1
adding file2
adding file3
$ hg rm file1
$ echo changed >> file2
$ echo changed1 >> file3
$ hg ci -m 'removed file1, changed file2, changed file3'
$ hg co 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ echo changed2 >> file3
$ hg ci -m 'changed file1, removed file2, changed file3'
created new head
Non-interactive merge:
$ hg merge -y
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
file 'file2' 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 file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
M file2
M file3
C file1
--- resolve --list ---
U file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2
=======
changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Interactive merge:
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> c
> d
> EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? c
file 'file2' 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? d
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 2 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
file2: * (glob)
M file3
C file1
--- resolve --list ---
R file1
R file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
*** file2 does not exist
--- file3 ---
3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2
=======
changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Interactive merge with bad input:
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> foo
> bar
> d
> baz
> c
> EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? foo
unrecognized response
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? bar
unrecognized response
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? d
file 'file2' 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? baz
unrecognized response
file 'file2' 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? c
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 1 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
M file2
M file3
R file1
--- resolve --list ---
R file1
R file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
*** file1 does not exist
--- file2 ---
2
changed
--- file3 ---
3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2
=======
changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Interactive merge with not enough input:
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> d
> EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? d
file 'file2' 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?
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 1 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
M file2
M file3
R file1
--- resolve --list ---
R file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
*** file1 does not exist
--- file2 ---
2
changed
--- file3 ---
3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2
=======
changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Choose local versions of files
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :local
0 files updated, 3 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ status 2>&1 | tee $TESTTMP/local.status
--- status ---
file2: * (glob)
M file3
C file1
--- resolve --list ---
R file1
R file2
R file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "r")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
*** file2 does not exist
--- file3 ---
3
changed2
Choose other versions of files
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :other
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ status 2>&1 | tee $TESTTMP/other.status
--- status ---
M file2
M file3
R file1
--- resolve --list ---
R file1
R file2
R file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "r")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
*** file1 does not exist
--- file2 ---
2
changed
--- file3 ---
3
changed1
Fail
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :fail
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status 2>&1 | tee $TESTTMP/fail.status
--- status ---
M file2
M file3
C file1
--- resolve --list ---
U file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed2
Force prompts with no input (should be similar to :fail)
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' 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?
file 'file3' 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?
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status 2>&1 | tee $TESTTMP/prompt.status
--- status ---
M file2
M file3
C file1
--- resolve --list ---
U file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed2
$ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
Force prompts
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :prompt
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
file 'file2' 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
file 'file3' 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
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
M file2
M file3
C file1
--- resolve --list ---
U file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed2
Choose to merge all files
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :merge3
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
file 'file2' 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 file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ status
--- status ---
M file2
M file3
C file1
--- resolve --list ---
U file1
U file2
U file3
--- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
extra: merged = yes
file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c...
changed2
||||||| common ancestor: ab57bf49aa27 - test: added files
=======
changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c...
Exercise transitions between local, other, fail and prompt, and make sure the
dirstate stays consistent. (Compare with each other and to the above
invocations.)
$ testtransitions() {
> # this traversal order covers every transition
> tools="local other prompt local fail other local prompt other fail prompt fail local"
> lasttool="merge3"
> for tool in $tools; do
> echo "=== :$lasttool -> :$tool ==="
> ref="$TESTTMP/$tool.status"
> hg resolve --unmark --all
> hg resolve --tool ":$tool" --all --config ui.interactive=True
> status > "$TESTTMP/compare.status" 2>&1
> echo '--- diff of status ---'
> if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then
> echo '(status identical)'
> fi
> lasttool="$tool"
> echo
> done
> }
$ testtransitions
=== :merge3 -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' 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?
file 'file3' 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?
--- diff of status ---
(status identical)
=== :prompt -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' 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?
file 'file3' 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?
--- diff of status ---
(status identical)
=== :prompt -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' 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?
file 'file3' 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?
--- diff of status ---
(status identical)
=== :prompt -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
Non-interactive linear update
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 -y
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ status
--- status ---
A file1
C file2
C file3
--- resolve --list ---
U file1
U file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed1
Choose local versions of files
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :local
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
$ status 2>&1 | tee $TESTTMP/local.status
--- status ---
file2: * (glob)
A file1
C file3
--- resolve --list ---
R file1
R file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
*** file2 does not exist
--- file3 ---
3
changed1
Choose other versions of files
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :other
1 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ status 2>&1 | tee $TESTTMP/other.status
--- status ---
file1: * (glob)
C file2
C file3
--- resolve --list ---
R file1
R file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
*** file1 does not exist
--- file2 ---
2
changed
--- file3 ---
3
changed1
Fail
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :fail
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ status 2>&1 | tee $TESTTMP/fail.status
--- status ---
A file1
C file2
C file3
--- resolve --list ---
U file1
U file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed1
Force prompts with no input
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ status 2>&1 | tee $TESTTMP/prompt.status
--- status ---
A file1
C file2
C file3
--- resolve --list ---
U file1
U file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed1
$ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
Choose to merge all files
$ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :merge3
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ status
--- status ---
A file1
C file2
C file3
--- resolve --list ---
U file1
U file2
--- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merged = yes
--- file1 ---
1
changed
--- file2 ---
2
changed
--- file3 ---
3
changed1
Test transitions between different merge tools
$ testtransitions
=== :merge3 -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)