Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-A3.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 31 Jan 2021 16:15:26 +0800 |
parents | 9f69164cdc16 669270305ccb |
children |
comparison
equal
deleted
inserted
replaced
5765:98e87c181e0f | 5766:82da27321e91 |
---|---|
144 adding changesets | 144 adding changesets |
145 adding manifests | 145 adding manifests |
146 adding file changes | 146 adding file changes |
147 added 1 changesets with 1 changes to 1 files | 147 added 1 changesets with 1 changes to 1 files |
148 1 new obsolescence markers | 148 1 new obsolescence markers |
149 new changesets e5ea8f9c7314 (1 drafts) | 149 new changesets e5ea8f9c7314 |
150 (run 'hg update' to get a working copy) | 150 (run 'hg update' to get a working copy) |
151 ## post pull state | 151 ## post pull state |
152 # obstore: main | 152 # obstore: main |
153 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 153 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
154 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 154 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
266 adding file changes | 266 adding file changes |
267 added 1 changesets with 1 changes to 1 files (+1 heads) | 267 added 1 changesets with 1 changes to 1 files (+1 heads) |
268 1 new obsolescence markers | 268 1 new obsolescence markers |
269 obsoleted 1 changesets | 269 obsoleted 1 changesets |
270 1 new orphan changesets | 270 1 new orphan changesets |
271 new changesets e5ea8f9c7314 (1 drafts) | 271 new changesets e5ea8f9c7314 |
272 (run 'hg heads' to see heads, 'hg merge' to merge) | 272 (run 'hg heads' to see heads, 'hg merge' to merge) |
273 ## post pull state | 273 ## post pull state |
274 # obstore: main | 274 # obstore: main |
275 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 275 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
276 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 276 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |