test-merge5: ensure updating to tip across branches is tested
authorBrodie Rao <brodie@bitheap.org>
Thu, 02 Sep 2010 12:48:46 -0400
changeset 12154 c85e07a2d783
parent 12152 e59156a1316f
child 12155 94ad12aa0530
test-merge5: ensure updating to tip across branches is tested When doing "hg update" across branches (without any revision specified), hg will abort and ask the user to merge or do hg update -c. This tests for that error.
tests/test-merge5.t
--- a/tests/test-merge5.t	Thu Sep 02 17:28:20 2010 +0200
+++ b/tests/test-merge5.t	Thu Sep 02 12:48:46 2010 -0400
@@ -13,6 +13,12 @@
   $ hg commit -A -m"comment #2" -d "1000000 0"
   removing b
   created new head
+  $ hg update 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg update
+  abort: crosses branches (use 'hg merge' or use 'hg update -c')
+  $ hg update -c
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mv a c
 in theory, we shouldn't need the "-y" below, but it prevents
 this test from hanging when "hg update" erroneously prompts the