Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-A4.t @ 4174:e07e764c0f48 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 12 Oct 2018 15:20:54 +0200 |
parents | 98941c28f3e2 e268f7fd7839 |
children | 3d917da5bd95 |
comparison
equal
deleted
inserted
replaced
4173:e268f7fd7839 | 4174:e07e764c0f48 |
---|---|
131 adding changesets | 131 adding changesets |
132 adding manifests | 132 adding manifests |
133 adding file changes | 133 adding file changes |
134 added 2 changesets with 2 changes to 2 files | 134 added 2 changesets with 2 changes to 2 files |
135 1 new obsolescence markers | 135 1 new obsolescence markers |
136 new changesets 28b51eb45704:06055a7959d4 | |
137 (run 'hg update' to get a working copy) | 136 (run 'hg update' to get a working copy) |
138 ## post pull state | 137 ## post pull state |
139 # obstore: main | 138 # obstore: main |
140 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 139 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
141 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 140 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |