Mercurial > evolve

diff tests/test-stabilize-result.t @ 1443:6c122c975125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add a hint when the parent working copy become obsolete This should help people find the right commands to recover from this situation.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 24 Jun 2015 16:37:02 -0700
parents 848a04c078c7
children 5f6e78aea094
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Tue Jun 23 18:16:21 2015 -0700
+++ b/tests/test-stabilize-result.t	Wed Jun 24 16:37:02 2015 -0700
@@ -224,6 +224,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
+  (use "hg evolve" to update to its successor)
   $ mv a a.old
   $ echo 'jungle' > a
   $ cat a.old >> a
@@ -336,6 +337,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
+  (use "hg evolve" to update to its successor)
   $ echo 'gotta break' >> a
   $ hg amend
   2 new divergent changesets