# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1397160122 14400
# Node ID f13facb01ac5a68a463fb8e5a428ca04d5213346
# Parent  e5baeb8fefec71abf72849d30f00836a10492644
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.

diff -r e5baeb8fefec -r f13facb01ac5 README
--- a/README	Mon Apr 14 15:46:27 2014 -0400
+++ b/README	Thu Apr 10 16:02:02 2014 -0400
@@ -54,6 +54,7 @@
 - adds a --obsolete flag to import (requieres Mercurial 3.0)
 - prune: update to successor rather than parent when pruning '.' with -s
 - fold: add missing --message and --logfile option
+- fold: add squash as an alias
 
 3.3.1 -- 2014-04-23
 
diff -r e5baeb8fefec -r f13facb01ac5 hgext/evolve.py
--- a/hgext/evolve.py	Mon Apr 14 15:46:27 2014 -0400
+++ b/hgext/evolve.py	Thu Apr 10 16:02:02 2014 -0400
@@ -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 ?
diff -r e5baeb8fefec -r f13facb01ac5 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Mon Apr 14 15:46:27 2014 -0400
+++ b/tests/test-tutorial.t	Thu Apr 10 16:02:02 2014 -0400
@@ -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