This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8119

tests: add tests of debugmergestate with unresolved/resolved path conflicts
ClosedPublic

Authored by martinvonz on Feb 14 2020, 1:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG382f4f09f0bd: tests: add tests of debugmergestate with unresolved/resolved path conflicts
Summary

I'm about to change hg debugmergestate and it broke on these "pu"
and "pr" records on my first attempt (D8113), so let's add test
coverage.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-pathconflicts-merge.t (16 lines)

Diff 20363

tests/test-pathconflicts-merge.t

getting a/b/c/d getting a/b/c/d
1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg status $ hg status
M a/b/c/d M a/b/c/d
A a/b~0ed027b96f31 A a/b~0ed027b96f31
R a/b R a/b
$ hg debugmergestate
* version 2 records
local: 0ed027b96f31a2560c8abe689ba59876409a2b8e
other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
labels:
local: working copy
other: merge rev
unrecognized entry: P a/b pu a/b~0ed027b96f31 l
$ hg resolve --all $ hg resolve --all
a/b: path conflict must be resolved manually a/b: path conflict must be resolved manually
$ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31 $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
$ hg resolve --mark a/b $ hg resolve --mark a/b
(no more unresolved files) (no more unresolved files)
$ hg commit -m "merge file and dir (deleted file)" $ hg commit -m "merge file and dir (deleted file)"
Merge - local symlink conflicts with remote directory Merge - local symlink conflicts with remote directory
R a/b R a/b
$ hg resolve --list $ hg resolve --list
P a/b P a/b
$ hg resolve --all $ hg resolve --all
a/b: path conflict must be resolved manually a/b: path conflict must be resolved manually
$ hg mv a/b~2ea68033e3be a/b.old $ hg mv a/b~2ea68033e3be a/b.old
$ hg resolve --mark a/b $ hg resolve --mark a/b
(no more unresolved files) (no more unresolved files)
$ hg debugmergestate
* version 2 records
local: 2ea68033e3be03a560471c1fc9e5704fbedb9b4b
other: 9049d9534d5c5d16264aab02b4b9e20d03faabef
labels:
local: working copy
other: merge rev
unrecognized entry: P a/b pr a/b~2ea68033e3be l
$ hg resolve --list $ hg resolve --list
R a/b R a/b
$ hg commit -m "merge link and dir (renamed link)" $ hg commit -m "merge link and dir (renamed link)"
Merge - local directory conflicts with remote file or link Merge - local directory conflicts with remote file or link
$ hg up dir $ hg up dir
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved