Mercurial > evolve
diff tests/test-sharing.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 21 Mar 2018 16:32:54 +0100 |
parents | 98941c28f3e2 1e2f683e11e7 |
children |
line wrap: on
line diff
--- a/tests/test-sharing.t Wed Mar 21 16:18:31 2018 +0100 +++ b/tests/test-sharing.t Wed Mar 21 16:32:54 2018 +0100 @@ -88,9 +88,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - obsoleted 1 changesets 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to "60ffde5765c5: fix bug 37" 1 other heads for branch "default" Figure SG03 @@ -122,7 +120,6 @@ $ cd ../test-repo $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to "de6151c48e1c: fix bug 37" 1 other heads for branch "default" $ hg shortlog --hidden -G @ 4:de6151c48e1c draft fix bug 37 @@ -213,7 +210,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - obsoleted 1 changesets updating bookmark bug15 $ hg -R ../review bookmarks bug15 3:cbdfbd5a5db2 @@ -258,7 +254,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - obsoleted 1 changesets updating bookmark featureX Bob receives second review, amends, and pushes to public: @@ -284,7 +279,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - obsoleted 1 changesets updating bookmark featureX $ hg -R ../review bookmarks bug15 3:cbdfbd5a5db2 @@ -400,7 +394,6 @@ adding file changes added 1 changesets with 0 changes to 1 files 1 new obsolescence markers - obsoleted 1 changesets updating bookmark bug15 Figure SG08: review and public changesets after Alice pushes.