|
|
test that a commit clears the merge state.
|
|
|
|
|
|
$ hg init repo
|
|
|
$ cd repo
|
|
|
|
|
|
$ echo foo > file1
|
|
|
$ echo foo > file2
|
|
|
$ hg commit -Am 'add files'
|
|
|
adding file1
|
|
|
adding file2
|
|
|
|
|
|
$ echo bar >> file1
|
|
|
$ echo bar >> file2
|
|
|
$ hg commit -Am 'append bar to files'
|
|
|
|
|
|
create a second head with conflicting edits
|
|
|
|
|
|
$ hg up -C 0
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ echo baz >> file1
|
|
|
$ echo baz >> file2
|
|
|
$ hg commit -Am 'append baz to files'
|
|
|
created new head
|
|
|
|
|
|
create a third head with no conflicting edits
|
|
|
$ hg up -qC 0
|
|
|
$ echo foo > file3
|
|
|
$ hg commit -Am 'add non-conflicting file'
|
|
|
adding file3
|
|
|
created new head
|
|
|
|
|
|
failing merge
|
|
|
|
|
|
$ hg up -qC 2
|
|
|
$ hg merge --tool=internal:fail 1
|
|
|
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
|
|
|
[1]
|
|
|
|
|
|
resolve -l should contain unresolved entries
|
|
|
|
|
|
$ hg resolve -l
|
|
|
U file1
|
|
|
U file2
|
|
|
|
|
|
$ hg resolve -l --no-status
|
|
|
file1
|
|
|
file2
|
|
|
|
|
|
resolving an unknown path should emit a warning, but not for -l
|
|
|
|
|
|
$ hg resolve -m does-not-exist
|
|
|
arguments do not match paths that need resolving
|
|
|
$ hg resolve -l does-not-exist
|
|
|
|
|
|
tell users how they could have used resolve
|
|
|
|
|
|
$ mkdir nested
|
|
|
$ cd nested
|
|
|
$ hg resolve -m file1
|
|
|
arguments do not match paths that need resolving
|
|
|
(try: hg resolve -m path:file1)
|
|
|
$ hg resolve -m file1 filez
|
|
|
arguments do not match paths that need resolving
|
|
|
(try: hg resolve -m path:file1 path:filez)
|
|
|
$ hg resolve -m path:file1 path:filez
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
U file2
|
|
|
$ hg resolve -m filez file2
|
|
|
arguments do not match paths that need resolving
|
|
|
(try: hg resolve -m path:filez path:file2)
|
|
|
$ hg resolve -m path:filez path:file2
|
|
|
(no more unresolved files)
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
R file2
|
|
|
|
|
|
cleanup
|
|
|
$ hg resolve -u
|
|
|
$ cd ..
|
|
|
$ rmdir nested
|
|
|
|
|
|
don't allow marking or unmarking driver-resolved files
|
|
|
|
|
|
$ cat > $TESTTMP/markdriver.py << EOF
|
|
|
> '''mark and unmark files as driver-resolved'''
|
|
|
> from mercurial import (
|
|
|
> merge,
|
|
|
> pycompat,
|
|
|
> registrar,
|
|
|
> scmutil,
|
|
|
> )
|
|
|
> cmdtable = {}
|
|
|
> command = registrar.command(cmdtable)
|
|
|
> @command(b'markdriver',
|
|
|
> [(b'u', b'unmark', None, b'')],
|
|
|
> b'FILE...')
|
|
|
> def markdriver(ui, repo, *pats, **opts):
|
|
|
> wlock = repo.wlock()
|
|
|
> opts = pycompat.byteskwargs(opts)
|
|
|
> try:
|
|
|
> ms = merge.mergestate.read(repo)
|
|
|
> m = scmutil.match(repo[None], pats, opts)
|
|
|
> for f in ms:
|
|
|
> if not m(f):
|
|
|
> continue
|
|
|
> if not opts[b'unmark']:
|
|
|
> ms.mark(f, b'd')
|
|
|
> else:
|
|
|
> ms.mark(f, b'u')
|
|
|
> ms.commit()
|
|
|
> finally:
|
|
|
> wlock.release()
|
|
|
> EOF
|
|
|
$ hg --config extensions.markdriver=$TESTTMP/markdriver.py markdriver file1
|
|
|
$ hg resolve --list
|
|
|
D file1
|
|
|
U file2
|
|
|
$ hg resolve --mark file1
|
|
|
not marking file1 as it is driver-resolved
|
|
|
this should not print out file1
|
|
|
$ hg resolve --mark --all
|
|
|
(no more unresolved files -- run "hg resolve --all" to conclude)
|
|
|
$ hg resolve --mark 'glob:file*'
|
|
|
(no more unresolved files -- run "hg resolve --all" to conclude)
|
|
|
$ hg resolve --list
|
|
|
D file1
|
|
|
R file2
|
|
|
$ hg resolve --unmark file1
|
|
|
not unmarking file1 as it is driver-resolved
|
|
|
(no more unresolved files -- run "hg resolve --all" to conclude)
|
|
|
$ hg resolve --unmark --all
|
|
|
$ hg resolve --list
|
|
|
D file1
|
|
|
U file2
|
|
|
$ hg --config extensions.markdriver=$TESTTMP/markdriver.py markdriver --unmark file1
|
|
|
$ hg resolve --list
|
|
|
U file1
|
|
|
U file2
|
|
|
|
|
|
resolve the failure
|
|
|
|
|
|
$ echo resolved > file1
|
|
|
$ hg resolve -m file1
|
|
|
|
|
|
resolve -l should show resolved file as resolved
|
|
|
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
U file2
|
|
|
|
|
|
$ hg resolve -l -Tjson
|
|
|
[
|
|
|
{
|
|
|
"path": "file1",
|
|
|
"status": "R"
|
|
|
},
|
|
|
{
|
|
|
"path": "file2",
|
|
|
"status": "U"
|
|
|
}
|
|
|
]
|
|
|
|
|
|
$ hg resolve -l -T '{path} {status} {p1rev} {p2rev}\n'
|
|
|
file1 R 2 1
|
|
|
file2 U 2 1
|
|
|
|
|
|
resolve -m without paths should mark all resolved
|
|
|
|
|
|
$ hg resolve -m
|
|
|
(no more unresolved files)
|
|
|
$ hg commit -m 'resolved'
|
|
|
|
|
|
resolve -l should be empty after commit
|
|
|
|
|
|
$ hg resolve -l
|
|
|
|
|
|
$ hg resolve -l -Tjson
|
|
|
[
|
|
|
]
|
|
|
|
|
|
resolve --all should abort when no merge in progress
|
|
|
|
|
|
$ hg resolve --all
|
|
|
abort: resolve command not applicable when not merging
|
|
|
[255]
|
|
|
|
|
|
resolve -m should abort when no merge in progress
|
|
|
|
|
|
$ hg resolve -m
|
|
|
abort: resolve command not applicable when not merging
|
|
|
[255]
|
|
|
|
|
|
can not update or merge when there are unresolved conflicts
|
|
|
|
|
|
$ hg up -qC 0
|
|
|
$ echo quux >> file1
|
|
|
$ hg up 1
|
|
|
merging file1
|
|
|
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
|
|
|
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
use 'hg resolve' to retry unresolved file merges
|
|
|
[1]
|
|
|
$ hg up 0
|
|
|
abort: outstanding merge conflicts
|
|
|
[255]
|
|
|
$ hg merge 2
|
|
|
abort: outstanding merge conflicts
|
|
|
[255]
|
|
|
$ hg merge --force 2
|
|
|
abort: outstanding merge conflicts
|
|
|
[255]
|
|
|
|
|
|
set up conflict-free merge
|
|
|
|
|
|
$ hg up -qC 3
|
|
|
$ hg merge 1
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
|
resolve --all should do nothing in merge without conflicts
|
|
|
$ hg resolve --all
|
|
|
(no more unresolved files)
|
|
|
|
|
|
resolve -m should do nothing in merge without conflicts
|
|
|
|
|
|
$ hg resolve -m
|
|
|
(no more unresolved files)
|
|
|
|
|
|
get back to conflicting state
|
|
|
|
|
|
$ hg up -qC 2
|
|
|
$ hg merge --tool=internal:fail 1
|
|
|
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
|
|
|
[1]
|
|
|
|
|
|
resolve without arguments should suggest --all
|
|
|
$ hg resolve
|
|
|
abort: no files or directories specified
|
|
|
(use --all to re-merge all unresolved files)
|
|
|
[255]
|
|
|
|
|
|
resolve --all should re-merge all unresolved files
|
|
|
$ hg resolve --all
|
|
|
merging file1
|
|
|
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
|
|
|
foo
|
|
|
baz
|
|
|
$ cat file2.orig
|
|
|
foo
|
|
|
baz
|
|
|
|
|
|
.orig files should exists where specified
|
|
|
$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
|
|
|
merging file1
|
|
|
creating directory: $TESTTMP/repo/.hg/origbackups
|
|
|
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
|
|
|
file1
|
|
|
file2
|
|
|
$ grep '<<<' file1 > /dev/null
|
|
|
$ grep '<<<' file2 > /dev/null
|
|
|
|
|
|
resolve <file> should re-merge file
|
|
|
$ echo resolved > file1
|
|
|
$ hg resolve -q file1
|
|
|
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
|
|
|
[1]
|
|
|
$ grep '<<<' file1 > /dev/null
|
|
|
|
|
|
test .orig behavior with resolve
|
|
|
|
|
|
$ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
|
|
|
$TESTTMP/repo/file1.orig:
|
|
|
>>>
|
|
|
foo
|
|
|
baz
|
|
|
<<<
|
|
|
|
|
|
resolve <file> should do nothing if 'file' was marked resolved
|
|
|
$ echo resolved > file1
|
|
|
$ hg resolve -m file1
|
|
|
$ hg resolve -q file1
|
|
|
$ cat file1
|
|
|
resolved
|
|
|
|
|
|
insert unsupported advisory merge record
|
|
|
|
|
|
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
|
|
|
$ hg debugmergestate
|
|
|
* version 2 records
|
|
|
local: 57653b9f834a4493f7240b0681efcb9ae7cab745
|
|
|
other: dc77451844e37f03f5c559e3b8529b2b48d381d1
|
|
|
labels:
|
|
|
local: working copy
|
|
|
other: merge rev
|
|
|
unrecognized entry: x advisory record
|
|
|
file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
|
|
|
file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
local path: file1 (flags "")
|
|
|
ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
|
|
|
other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
|
|
|
file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
|
|
|
file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523)
|
|
|
local path: file2 (flags "")
|
|
|
ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
|
|
|
other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
U file2
|
|
|
|
|
|
insert unsupported mandatory merge record
|
|
|
|
|
|
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
|
|
|
$ hg debugmergestate
|
|
|
* version 2 records
|
|
|
local: 57653b9f834a4493f7240b0681efcb9ae7cab745
|
|
|
other: dc77451844e37f03f5c559e3b8529b2b48d381d1
|
|
|
labels:
|
|
|
local: working copy
|
|
|
other: merge rev
|
|
|
file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
|
|
|
file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
local path: file1 (flags "")
|
|
|
ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
|
|
|
other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
|
|
|
file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
|
|
|
file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523)
|
|
|
local path: file2 (flags "")
|
|
|
ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
|
|
|
other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
|
|
|
unrecognized entry: X mandatory record
|
|
|
$ hg resolve -l
|
|
|
abort: unsupported merge state records: X
|
|
|
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
|
|
|
[255]
|
|
|
$ hg resolve -ma
|
|
|
abort: unsupported merge state records: X
|
|
|
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
|
|
|
[255]
|
|
|
$ hg summary
|
|
|
warning: merge state has unsupported record types: X
|
|
|
parent: 2:57653b9f834a
|
|
|
append baz to files
|
|
|
parent: 1:dc77451844e3
|
|
|
append bar to files
|
|
|
branch: default
|
|
|
commit: 2 modified, 2 unknown (merge)
|
|
|
update: 2 new changesets (update)
|
|
|
phases: 5 draft
|
|
|
|
|
|
update --clean shouldn't abort on unsupported records
|
|
|
|
|
|
$ hg up -qC 1
|
|
|
$ hg debugmergestate
|
|
|
no merge state found
|
|
|
|
|
|
test crashed merge with empty mergestate
|
|
|
|
|
|
$ mkdir .hg/merge
|
|
|
$ touch .hg/merge/state
|
|
|
|
|
|
resolve -l should be empty
|
|
|
|
|
|
$ hg resolve -l
|
|
|
|
|
|
resolve -m can be configured to look for remaining conflict markers
|
|
|
$ hg up -qC 2
|
|
|
$ hg merge -q --tool=internal:merge 1
|
|
|
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
|
|
|
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
|
|
|
[1]
|
|
|
$ hg resolve -l
|
|
|
U file1
|
|
|
U file2
|
|
|
$ echo 'remove markers' > file1
|
|
|
$ hg --config commands.resolve.mark-check=abort resolve -m
|
|
|
warning: the following files still have conflict markers:
|
|
|
file2
|
|
|
abort: conflict markers detected
|
|
|
(use --all to mark anyway)
|
|
|
[255]
|
|
|
$ hg resolve -l
|
|
|
U file1
|
|
|
U file2
|
|
|
Try with --all from the hint
|
|
|
$ hg --config commands.resolve.mark-check=abort resolve -m --all
|
|
|
warning: the following files still have conflict markers:
|
|
|
file2
|
|
|
(no more unresolved files)
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
R file2
|
|
|
$ hg resolve --unmark
|
|
|
$ hg resolve -l
|
|
|
U file1
|
|
|
U file2
|
|
|
$ hg --config commands.resolve.mark-check=warn resolve -m
|
|
|
warning: the following files still have conflict markers:
|
|
|
file2
|
|
|
(no more unresolved files)
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
R file2
|
|
|
If the file is already marked as resolved, we don't warn about it
|
|
|
$ hg resolve --unmark file1
|
|
|
$ hg resolve -l
|
|
|
U file1
|
|
|
R file2
|
|
|
$ hg --config commands.resolve.mark-check=warn resolve -m
|
|
|
(no more unresolved files)
|
|
|
$ hg resolve -l
|
|
|
R file1
|
|
|
R file2
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
======================================================
|
|
|
Test 'hg resolve' confirm config option functionality |
|
|
|
======================================================
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
> [extensions]
|
|
|
> rebase=
|
|
|
> EOF
|
|
|
|
|
|
$ hg init repo2
|
|
|
$ cd repo2
|
|
|
|
|
|
$ echo boss > boss
|
|
|
$ hg ci -Am "add boss"
|
|
|
adding boss
|
|
|
|
|
|
$ for emp in emp1 emp2 emp3; do echo work > $emp; done;
|
|
|
$ hg ci -Aqm "added emp1 emp2 emp3"
|
|
|
|
|
|
$ hg up 0
|
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
|
|
|
|
$ for emp in emp1 emp2 emp3; do echo nowork > $emp; done;
|
|
|
$ hg ci -Aqm "added lazy emp1 emp2 emp3"
|
|
|
|
|
|
$ hg log -GT "{rev} {node|short} {firstline(desc)}\n"
|
|
|
@ 2 0acfd4a49af0 added lazy emp1 emp2 emp3
|
|
|
|
|
|
|
| o 1 f30f98a8181f added emp1 emp2 emp3
|
|
|
|/
|
|
|
o 0 88660038d466 add boss
|
|
|
|
|
|
$ hg rebase -s 1 -d 2
|
|
|
rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
|
|
|
merging emp1
|
|
|
merging emp2
|
|
|
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)
|
|
|
[1]
|
|
|
|
|
|
Test when commands.resolve.confirm config option is not set:
|
|
|
===========================================================
|
|
|
$ hg resolve --all
|
|
|
merging emp1
|
|
|
merging emp2
|
|
|
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]
|
|
|
|
|
|
Test when config option is set:
|
|
|
==============================
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
> [ui]
|
|
|
> interactive = True
|
|
|
> [commands]
|
|
|
> resolve.confirm = True
|
|
|
> EOF
|
|
|
|
|
|
$ hg resolve
|
|
|
abort: no files or directories specified
|
|
|
(use --all to re-merge all unresolved files)
|
|
|
[255]
|
|
|
$ hg resolve --all << EOF
|
|
|
> n
|
|
|
> EOF
|
|
|
re-merge all unresolved files (yn)? n
|
|
|
abort: user quit
|
|
|
[255]
|
|
|
|
|
|
$ hg resolve --all << EOF
|
|
|
> y
|
|
|
> EOF
|
|
|
re-merge all unresolved files (yn)? y
|
|
|
merging emp1
|
|
|
merging emp2
|
|
|
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]
|
|
|
|
|
|
Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):
|
|
|
===============================================================================================
|
|
|
|
|
|
$ hg resolve -m emp1
|
|
|
$ hg resolve -l
|
|
|
R emp1
|
|
|
U emp2
|
|
|
U emp3
|
|
|
|
|
|
$ hg resolve -m << EOF
|
|
|
> n
|
|
|
> EOF
|
|
|
mark all unresolved files as resolved (yn)? n
|
|
|
abort: user quit
|
|
|
[255]
|
|
|
|
|
|
$ hg resolve -m << EOF
|
|
|
> y
|
|
|
> EOF
|
|
|
mark all unresolved files as resolved (yn)? y
|
|
|
(no more unresolved files)
|
|
|
continue: hg rebase --continue
|
|
|
$ hg resolve -l
|
|
|
R emp1
|
|
|
R emp2
|
|
|
R emp3
|
|
|
|
|
|
$ hg rebase --abort
|
|
|
rebase aborted
|
|
|
$ cd ..
|
|
|
|
