Mercurial > evolve

changeset 295:a5894bb97909

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove --change . == --change .^ crazyness
author Patrick Mezard <patrick@mezard.eu>
date Thu, 21 Jun 2012 17:33:02 +0200
parents 98c9c69c311d
children c3ff47e6bd36
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Thu Jun 21 16:23:42 2012 +0200
+++ b/hgext/evolve.py	Thu Jun 21 17:33:02 2012 +0200
@@ -410,9 +410,6 @@
 
     If you specify --change, amend additionally considers all changesets between
     the indicated changeset and the working copy parent as updates to be subsumed.
-    This allows you to commit updates manually first. As a special shorthand you
-    can say `--amend .` instead of '--amend p1(p1())', which subsumes your latest
-    commit as an update of its parent.
 
     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
@@ -424,10 +421,7 @@
     """
 
     # determine updates to subsume
-    change = opts.get('change', '.')
-    if change == '.':
-        change = 'p1(p1())'
-    old = scmutil.revsingle(repo, change)
+    old = scmutil.revsingle(repo, opts.get('change') or '.')
 
     lock = repo.lock()
     try: