Mercurial > evolve
comparison tests/test-obsolete.t @ 1038:45c4739e85dc
evolve: make the "pulling obsolescence marker" message important
This is likely to take some time the user needs to know what is going on.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 17:40:01 -0700 |
| parents | bddee73b361e |
| children | 657a38cd2ae3 |
comparison
equal
deleted
inserted
replaced
| 1037:bddee73b361e | 1038:45c4739e85dc |
|---|---|
| 271 searching for changes | 271 searching for changes |
| 272 adding changesets | 272 adding changesets |
| 273 adding manifests | 273 adding manifests |
| 274 adding file changes | 274 adding file changes |
| 275 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 275 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 276 pull obsolescence markers | |
| 276 (run 'hg heads' to see heads, 'hg merge' to merge) | 277 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 277 $ qlog -R ../other-new | 278 $ qlog -R ../other-new |
| 278 6 | 279 6 |
| 279 - 909a0fb57e5d | 280 - 909a0fb57e5d |
| 280 3 | 281 3 |
| 360 searching for changes | 361 searching for changes |
| 361 adding changesets | 362 adding changesets |
| 362 adding manifests | 363 adding manifests |
| 363 adding file changes | 364 adding file changes |
| 364 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 365 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 366 pull obsolescence markers | |
| 365 (run 'hg heads' to see heads, 'hg merge' to merge) | 367 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 366 | 368 |
| 367 $ hg up -q 7 # to check rollback update behavior | 369 $ hg up -q 7 # to check rollback update behavior |
| 368 $ qlog | 370 $ qlog |
| 369 7 | 371 7 |