Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable into default
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 25 Feb 2016 13:18:36 +0100
changeset 1618 a3da15803b7a
parent 1616 c216b175d535 (diff)
parent 1617 160968654581 (current diff)
child 1619 5ef77a1d975c
merge stable into default
--- a/tests/test-obsolete.t	Thu Feb 25 13:14:04 2016 +0100
+++ b/tests/test-obsolete.t	Thu Feb 25 13:18:36 2016 +0100
@@ -457,6 +457,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
   $ hg id -n
   8
 
--- a/tests/test-sharing.t	Thu Feb 25 13:14:04 2016 +0100
+++ b/tests/test-sharing.t	Thu Feb 25 13:18:36 2016 +0100
@@ -89,6 +89,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
 
 Figure SG03
   $ hg shortlog --hidden -G
@@ -119,6 +120,7 @@
   $ cd ../test-repo
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
   $ hg shortlog --hidden -G
   @  4:de6151c48e1c  draft  fix bug 37
   |
evolve