Mercurial > public > mercurial-scm > hg
diff tests/test-unamend.t @ 35435:f01101100043
unamend: allow unamending if allowunstable is set
I don't see why unamend should be disallowed when allowunstable is
set. By switching to rewriteutil.precheck() we fix that and get more
consistent error messages (and some additional ones).
Differential Revision: https://phab.mercurial-scm.org/D1682
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 13 Dec 2017 17:03:39 -0800 |
| parents | 9e339c97fabb |
| children | 1a09dad8b85a |
line wrap: on
line diff
--- a/tests/test-unamend.t Wed Dec 13 10:29:22 2017 -0800 +++ b/tests/test-unamend.t Wed Dec 13 17:03:39 2017 -0800 @@ -280,17 +280,20 @@ o 0:18d04c59bb5d Added a + $ hg --config experimental.evolution=createmarkers unamend + abort: cannot unamend changeset with children + [255] + $ hg unamend - abort: cannot unamend a changeset with children - [255] Trying to unamend a public changeset - $ hg up - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg up -C 23 + 5 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg phase -r . -p $ hg unamend abort: cannot unamend public changesets + (see 'hg help phases' for details) [255] Testing whether unamend retains copies or not