Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A3.t @ 3936:537fd9a86c06 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 03 Aug 2018 00:22:50 +0200 |
parents | 98941c28f3e2 |
children | 7a5c3175015e e07e764c0f48 |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A3.t Fri Aug 03 00:19:47 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Fri Aug 03 00:22:50 2018 +0200 @@ -145,7 +145,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -264,9 +263,8 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - new changesets e5ea8f9c7314 (run 'hg heads' to see heads, 'hg merge' to merge) - 1 new orphan changesets + 1 new unstable changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}