Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-A3.t @ 4082:185770c10a4e mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 22:59:20 +0200
parents 98941c28f3e2
children 7a5c3175015e e07e764c0f48
comparison
equal deleted inserted replaced
4081:20dcc92c285f 4082:185770c10a4e
143 adding changesets 143 adding changesets
144 adding manifests 144 adding manifests
145 adding file changes 145 adding file changes
146 added 1 changesets with 1 changes to 1 files 146 added 1 changesets with 1 changes to 1 files
147 1 new obsolescence markers 147 1 new obsolescence markers
148 new changesets e5ea8f9c7314
149 (run 'hg update' to get a working copy) 148 (run 'hg update' to get a working copy)
150 ## post pull state 149 ## post pull state
151 # obstore: main 150 # obstore: main
152 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 151 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
153 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 152 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
262 adding manifests 261 adding manifests
263 adding file changes 262 adding file changes
264 added 1 changesets with 1 changes to 1 files (+1 heads) 263 added 1 changesets with 1 changes to 1 files (+1 heads)
265 1 new obsolescence markers 264 1 new obsolescence markers
266 obsoleted 1 changesets 265 obsoleted 1 changesets
267 new changesets e5ea8f9c7314
268 (run 'hg heads' to see heads, 'hg merge' to merge) 266 (run 'hg heads' to see heads, 'hg merge' to merge)
269 1 new orphan changesets 267 1 new unstable changesets
270 ## post pull state 268 ## post pull state
271 # obstore: main 269 # obstore: main
272 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 270 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
273 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 271 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
274 # obstore: pushdest 272 # obstore: pushdest