# HG changeset patch # User Pierre-Yves David # Date 1384569864 18000 # Node ID bfdfdf731f8a987ffebdf3657070585cca12dbb1 # Parent a5474648a9d2e936e737c0b6259d28559ed36445 grab: update the alias for 2.8 compatibility 2.8 does not update on rebase anymore. We need to update by hand. this makes this alias more fragile. diff -r a5474648a9d2 -r bfdfdf731f8a README --- a/README Fri Nov 15 21:33:54 2013 -0500 +++ b/README Fri Nov 15 21:44:24 2013 -0500 @@ -52,6 +52,7 @@ - evolve command: allow updating to the successor if the parent is obsolete - gdown and gup commands: add next and previous alias, respectively +- make grab aliases compatible with Mercurial 2.8 3.1.0 -- 2013-02-11 diff -r a5474648a9d2 -r bfdfdf731f8a hgext/evolve.py --- a/hgext/evolve.py Fri Nov 15 21:33:54 2013 -0500 +++ b/hgext/evolve.py Fri Nov 15 21:44:24 2013 -0500 @@ -381,7 +381,7 @@ if ui.config('alias', 'odiff', None) is None: ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .") if ui.config('alias', 'grab', None) is None: - ui.setconfig('alias', 'grab', "rebase --dest . --rev $1") + ui.setconfig('alias', 'grab', "! $HG rebase --dest . --rev $@ && $HG up tip") ### Troubled revset symbol diff -r a5474648a9d2 -r bfdfdf731f8a tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Fri Nov 15 21:33:54 2013 -0500 +++ b/tests/test-stabilize-result.t Fri Nov 15 21:44:24 2013 -0500 @@ -121,7 +121,6 @@ Get a successors of 8 on it $ hg grab 8 - $ hg update tip ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) Add real change to the successors