Mercurial > hg

diff tests/test-update-branches.t @ 19800:4894e0d9462d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: improve error message for dirty non-linear update with rev
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:08:52 -0700
parents ab3e42225dbc
children 41abe2e3e3b7
line wrap: on
line diff
--- a/tests/test-update-branches.t	Mon Sep 23 20:07:30 2013 -0700
+++ b/tests/test-update-branches.t	Mon Sep 23 20:08:52 2013 -0700
@@ -140,6 +140,12 @@
   parent=3
   M foo
 
+  $ norevtest 'none dirty cross'  dirty 2
+  abort: uncommitted changes
+  (commit and merge, or update --clean to discard changes)
+  parent=2
+  M foo
+
   $ revtest 'none dirtysub cross'  dirtysub 3 4
   abort: uncommitted changes
   (commit or update --clean to discard changes)