Mercurial > hg > evolve

changeset 1026:c02456bddfe3 draft obsolete stable for-marmoute

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fold: add squash as a possible alias In order to respect the habituation of the majority of DVCS users and to make this feature more easily discoverable, the very common "squash" terminology should be added as a synonym to "fold". Since git does not have a squash command, this should be safe.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 10 Apr 2014 16:02:02 -0400
obsolete rewritten as f13facb01ac5 by Pierre-Yves David <pierre-yves.david@fb.com> between Wed, 14 May 2014 16:23:35 -0700 and Wed, 14 May 2014 16:35:29 -0700
parents cd82f13e01b8
children
files hgext/evolve.py tests/test-tutorial.t
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1771,7 +1771,7 @@
     finally:
         lockmod.release(lock, wlock)
 
-@command('^fold',
+@command('^fold|squash',
     [('r', 'rev', [], _("explicitly specify the full set of revision to fold")),
     ] + commitopts + commitopts2,
     # allow to choose the seed ?
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -468,6 +468,8 @@
   $ hg help fold
   hg fold rev
   
+  aliases: squash
+  
   Fold multiple revisions into a single one
   
       The revisions from your current working directory to the given one are