Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-A1.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 | ccfcacc5ee7c ccbfbeee6cf3 |
| children | 3d917da5bd95 |
comparison
equal
deleted
inserted
replaced
| 4173:e268f7fd7839 | 4174:e07e764c0f48 |
|---|---|
| 111 adding changesets | 111 adding changesets |
| 112 adding manifests | 112 adding manifests |
| 113 adding file changes | 113 adding file changes |
| 114 added 1 changesets with 1 changes to 1 files | 114 added 1 changesets with 1 changes to 1 files |
| 115 1 new obsolescence markers | 115 1 new obsolescence markers |
| 116 new changesets f5bc6836db60 | |
| 117 (run 'hg update' to get a working copy) | 116 (run 'hg update' to get a working copy) |
| 118 ## post pull state | 117 ## post pull state |
| 119 # obstore: main | 118 # obstore: main |
| 120 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 119 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 121 # obstore: pushdest | 120 # obstore: pushdest |
| 153 adding changesets | 152 adding changesets |
| 154 adding manifests | 153 adding manifests |
| 155 adding file changes | 154 adding file changes |
| 156 added 1 changesets with 1 changes to 1 files | 155 added 1 changesets with 1 changes to 1 files |
| 157 1 new obsolescence markers | 156 1 new obsolescence markers |
| 158 new changesets f5bc6836db60 | |
| 159 (run 'hg update' to get a working copy) | 157 (run 'hg update' to get a working copy) |
| 160 ## post pull state | 158 ## post pull state |
| 161 # obstore: main | 159 # obstore: main |
| 162 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 160 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 163 # obstore: pushdest | 161 # obstore: pushdest |
| 267 adding changesets | 265 adding changesets |
| 268 adding manifests | 266 adding manifests |
| 269 adding file changes | 267 adding file changes |
| 270 added 2 changesets with 2 changes to 2 files | 268 added 2 changesets with 2 changes to 2 files |
| 271 1 new obsolescence markers | 269 1 new obsolescence markers |
| 272 new changesets f5bc6836db60:f6fbb35d8ac9 | |
| 273 (run 'hg update' to get a working copy) | 270 (run 'hg update' to get a working copy) |
| 274 ## post pull state | 271 ## post pull state |
| 275 # obstore: main | 272 # obstore: main |
| 276 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 273 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 277 # obstore: pushdest | 274 # obstore: pushdest |
| 309 adding changesets | 306 adding changesets |
| 310 adding manifests | 307 adding manifests |
| 311 adding file changes | 308 adding file changes |
| 312 added 2 changesets with 2 changes to 2 files | 309 added 2 changesets with 2 changes to 2 files |
| 313 1 new obsolescence markers | 310 1 new obsolescence markers |
| 314 new changesets f5bc6836db60:f6fbb35d8ac9 | |
| 315 (run 'hg update' to get a working copy) | 311 (run 'hg update' to get a working copy) |
| 316 ## post pull state | 312 ## post pull state |
| 317 # obstore: main | 313 # obstore: main |
| 318 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 314 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 319 # obstore: pushdest | 315 # obstore: pushdest |