Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A3.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | 8feb2cae7eae |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A3.t Wed Sep 27 16:24:44 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Wed Sep 27 16:26:30 2017 +0200 @@ -264,7 +264,7 @@ 1 new obsolescence markers obsoleted 1 changesets (run 'hg heads' to see heads, 'hg merge' to merge) - 1 new unstable changesets + 1 new orphan changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}