--- a/hgext/evolve.py Wed Feb 06 23:21:42 2013 +0000
+++ b/hgext/evolve.py Fri Feb 08 20:18:40 2013 +0000
@@ -1314,7 +1314,6 @@
[('A', 'addremove', None,
_('mark new/missing files as added/removed before committing')),
('n', 'note', '', _('use text as commit message for this update')),
- ('c', 'change', '', _('specifies the changesets to amend (DEPRECATED)'), _('REV')),
('e', 'edit', False, _('invoke editor on commit messages')),
] + walkopts + commitopts + commitopts2,
_('[OPTION]... [FILE]...'))
@@ -1328,10 +1327,6 @@
If you don't specify -m, the parent's message will be reused.
- If you specify --change, amend additionally considers all
- changesets between the indicated changeset and the working copy
- parent as updates to be subsumed.
-
Behind the scenes, Mercurial first commits the update as a regular child
of the current parent. Then it creates a new commit on the parent's parents
with the updated contents. Then it changes the working copy parent to this
@@ -1342,7 +1337,7 @@
"""
# determine updates to subsume
- old = scmutil.revsingle(repo, opts.get('change') or '.')
+ old = scmutil.revsingle(repo, '.')
lock = repo.lock()
try:
@@ -1351,8 +1346,6 @@
if old.phase() == phases.public:
raise util.Abort(_("can not rewrite immutable changeset %s")
% old)
- if not repo.revs('%d and (::.)', old):
- raise error.Abort(_('cannot amend non ancestor changeset'))
tr = repo.transaction('amend')
try:
oldphase = old.phase()