Mercurial > public > mercurial-scm > hg

diff tests/test-subrepo-svn.t @ 19799:ab3e42225dbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add error message for dirty non-linear update with no rev Previously, the error message for a dirty non-linear update was the same (and relatively unhelpful) whether or not a rev was specified. This patch and an upcoming one will introduce separate, more helpful hints.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:07:30 -0700
parents 6252b4f1c4b4
children 5e10d41e7b9c
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t	Mon Sep 23 17:43:33 2013 -0700
+++ b/tests/test-subrepo-svn.t	Mon Sep 23 20:07:30 2013 -0700
@@ -477,7 +477,8 @@
 This is surprising, but is also correct based on the current code:
   $ echo "updating should (maybe) fail" > obstruct/other
   $ hg co tip
-  abort: crosses branches (merge branches or use --clean to discard changes)
+  abort: uncommitted changes
+  (commit or update --clean to discard changes)
   [255]
 
 Point to a Subversion branch which has since been deleted and recreated