Submitter | phabricator |
---|---|
Date | Feb. 28, 2020, 7:57 p.m. |
Message ID | <differential-rev-PHID-DREV-6cbktppazfvoxqkm522j-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/45406/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t --- a/tests/test-update-branches.t +++ b/tests/test-update-branches.t @@ -343,6 +343,22 @@ $ hg resolve -l U a +Try to make empty commit while there are conflicts + $ hg revert -r . a + $ rm a.orig + $ hg ci -m empty + nothing changed + [1] + $ hg resolve -m a + (no more unresolved files) + $ hg resolve -l + R a + $ hg ci -m empty + nothing changed + [1] + $ hg resolve -l + R a + Change/delete conflict is not allowed $ hg up -qC 3 $ hg rm foo