diff tests/test-merge-criss-cross.t @ 28065:6b1fc09c699a

update: change default destination to tipmost descendant (issue4673) (BC)

Bare 'hg update' now brings you to the tipmost descendant (on the same branch).
Leaving the user on the same topological branch. The previous behavior, updating
to the tipmost changeset on the same branch could lead to jump from a
topological branch to another. This was confusing and impractical. As the only
conceivable reason for the old behavior have been address by the recently
introduce message about other heads, we can "safely" change this behavior

All test changes have been reviewed and seen a valid consequences.

--- a/tests/test-merge-criss-cross.t	Wed Feb 03 15:21:11 2016 +0000
+++ b/tests/test-merge-criss-cross.t	Tue Feb 02 15:24:11 2016 +0000
@@ -212,7 +212,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
-  $ hg up -qC
+  $ hg up -qC tip
   $ hg merge -v
   note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd