Mercurial > hg
changeset 44395:382f4f09f0bd
tests: add tests of debugmergestate with unresolved/resolved path conflicts
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.
Differential Revision: https://phab.mercurial-scm.org/D8119
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 13 Feb 2020 21:55:38 -0800 |
| parents | 5e3402a0b868 |
| children | acbfa31cfaf2 |
| files | tests/test-pathconflicts-merge.t |
| diffstat | 1 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-pathconflicts-merge.t Thu Feb 13 17:15:08 2020 -0800 +++ b/tests/test-pathconflicts-merge.t Thu Feb 13 21:55:38 2020 -0800 @@ -75,6 +75,14 @@ M a/b/c/d A a/b~0ed027b96f31 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 a/b: path conflict must be resolved manually $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31 @@ -106,6 +114,14 @@ $ hg mv a/b~2ea68033e3be a/b.old $ hg resolve --mark a/b (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 R a/b $ hg commit -m "merge link and dir (renamed link)"