Mercurial > hg

diff tests/test-absorb-phase.t @ 40190:31dfa7dac4c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
absorb: prompt user to accept absorb changes by default Change the default absorb behaviour to print the changes out and then prompt the user if they want to absorb the changes or not. Providing the `-p` option still prints the result and exits. A new `-a` option is provided which applies the changes without printing them, giving the equivalent of the old behaviour. Differential Revision: https://phab.mercurial-scm.org/D4999
author Mark Thomas <mbthomas@fb.com>
date Fri, 12 Oct 2018 17:48:40 +0000
parents 0b7594ada0db
children
line wrap: on
line diff
--- a/tests/test-absorb-phase.t	Fri Oct 12 15:46:52 2018 +0000
+++ b/tests/test-absorb-phase.t	Fri Oct 12 17:48:40 2018 +0000
@@ -19,7 +19,7 @@
   $ hg update C -q
   $ printf B1 > B
 
-  $ hg absorb -q
+  $ hg absorb -aq
 
   $ hg log -G -T '{desc} {phase}'
   @  C secret