diff tests/test-fetch.out @ 7049:6489ee64b522

fetch: use dirstate branch instead of first parents

--- a/tests/test-fetch.out	Mon Sep 22 14:47:21 2008 +0200
+++ b/tests/test-fetch.out	Wed Sep 24 13:22:11 2008 +0200
@@ -170,3 +170,11 @@
 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)
 % parent should be 3 (fetch did not merge anything)
 3
+% pull in change on different branch than dirstate
+adding a
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+marked working directory as branch topic
+abort: working dir not at branch tip (use "hg update" to check out branch tip)
+% parent should be 0 (fetch did not update or merge anything)
+0