Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 22952:8792ac090e3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: add allowunstable option This option allows the creation of unstable commits. This allows things like amending in the middle of a stack of commits, etc.
author Durham Goode <durham@fb.com>
date Tue, 14 Oct 2014 13:25:13 -0700
parents 2d0b60b5abc0
children 32b77aba2772
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Oct 14 13:23:52 2014 -0700
+++ b/mercurial/commands.py	Tue Oct 14 13:25:13 2014 -0700
@@ -1450,7 +1450,8 @@
             raise util.Abort(_('cannot amend public changesets'))
         if len(repo[None].parents()) > 1:
             raise util.Abort(_('cannot amend while merging'))
-        if (not obsolete._enabled) and old.children():
+        allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
+        if not allowunstable and old.children():
             raise util.Abort(_('cannot amend changeset with children'))
 
         # commitfunc is used only for temporary amend commit by cmdutil.amend