Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
35434:71446ca85813 | 35435:f01101100043 |
---|---|
278 o 1:29becc82797a Added b | 278 o 1:29becc82797a Added b |
279 | | 279 | |
280 o 0:18d04c59bb5d Added a | 280 o 0:18d04c59bb5d Added a |
281 | 281 |
282 | 282 |
283 $ hg unamend | 283 $ hg --config experimental.evolution=createmarkers unamend |
284 abort: cannot unamend a changeset with children | 284 abort: cannot unamend changeset with children |
285 [255] | 285 [255] |
286 | 286 |
287 $ hg unamend | |
288 | |
287 Trying to unamend a public changeset | 289 Trying to unamend a public changeset |
288 | 290 |
289 $ hg up | 291 $ hg up -C 23 |
290 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 292 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
291 $ hg phase -r . -p | 293 $ hg phase -r . -p |
292 $ hg unamend | 294 $ hg unamend |
293 abort: cannot unamend public changesets | 295 abort: cannot unamend public changesets |
296 (see 'hg help phases' for details) | |
294 [255] | 297 [255] |
295 | 298 |
296 Testing whether unamend retains copies or not | 299 Testing whether unamend retains copies or not |
297 | 300 |
298 $ hg status | 301 $ hg status |