Mercurial > evolve

diff tests/test-prune.t @ 964:c768f7666106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update to output change introduced by future 3.1
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 02 Jun 2014 15:22:23 -0700
parents bcd0c12070b2
children b286f77d680c
line wrap: on
line diff
--- a/tests/test-prune.t	Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-prune.t	Mon Jun 02 15:22:23 2014 -0700
@@ -41,6 +41,7 @@
   $ hg prune --user blah --date '1979-12-15' .
   1 changesets pruned
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  (leaving bookmark BABAR)
   working directory now at 47d2a3944de8
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
@@ -236,6 +237,7 @@
   $ hg bookmark -r 'c' 'delete'
   $ hg up -C todelete
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (activating bookmark todelete)
   $ hg prune -B nostrip
   bookmark 'nostrip' deleted
   abort: nothing to prune
@@ -244,6 +246,7 @@
   $ hg prune -B todelete
   1 changesets pruned
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (leaving bookmark todelete)
   working directory now at d62d843c9a01
   bookmark 'todelete' deleted
   $ hg id -ir dcbb326fdec2