Mercurial > public > mercurial-scm > hg-stable

diff tests/test-subrepo-svn.t @ 21404:ca275f7ec576

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: when deactivating a bookmark, print a message This helps prevent user confusion when innocent-seeming commands like 'hg update -C .' are run.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 14 May 2014 12:49:55 -0700
parents 7731a2281cf0
children 10f15e34d86c
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t	Thu Aug 02 13:51:34 2012 +0200
+++ b/tests/test-subrepo-svn.t	Wed May 14 12:49:55 2014 -0700
@@ -470,6 +470,7 @@
   $ hg book other
   $ hg co -r 'p1(tip)'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (leaving bookmark other)
   $ echo "obstruct =        [svn]       $SVNREPOURL/src" >> .hgsub
   $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct
   $ hg commit -m 'Other branch which will be obstructed'
@@ -543,6 +544,7 @@
   A    *recreated/somethingold (glob)
   Checked out revision 10.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (leaving bookmark other)
   $ test -f recreated/somethingold
 
 Test archive