Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-B5.t @ 3593:b92114f201c9 mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:35:18 +0100 |
| parents | 7a5c3175015e |
| children |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-B5.t Wed Mar 21 16:32:54 2018 +0100 +++ b/tests/test-exchange-obsmarkers-case-B5.t Wed Mar 21 16:35:18 2018 +0100 @@ -158,7 +158,7 @@ (run 'hg update' to get a working copy) ## post pull state # obstore: main - 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob) 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob) aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob)