Mercurial > hg

diff tests/test-issue1502.t @ 19798:76df01e56e7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: improve error message for clean non-linear update
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 17:43:33 -0700
parents 9910f60a37ee
children 2fc86d92c4a9
line wrap: on
line diff
--- a/tests/test-issue1502.t	Mon Sep 23 19:02:32 2013 -0700
+++ b/tests/test-issue1502.t	Mon Sep 23 17:43:33 2013 -0700
@@ -19,7 +19,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating: crosses branches (merge branches or update --check to force update)
+  not updating: not a linear update
+  (merge or update --check to force update)
 
   $ hg -R foo1 book branchy
   $ hg -R foo1 book