Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 6006:90af9db93d2b mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 12 Aug 2021 22:01:14 +0200 |
| parents | 82da27321e91 |
| children | 55e9987b8384 |
comparison
equal
deleted
inserted
replaced
| 6005:2da0e17ca1c0 | 6006:90af9db93d2b |
|---|---|
| 87 searching for changes | 87 searching for changes |
| 88 adding changesets | 88 adding changesets |
| 89 adding manifests | 89 adding manifests |
| 90 adding file changes | 90 adding file changes |
| 91 added 1 changesets with 1 changes to 1 files | 91 added 1 changesets with 1 changes to 1 files |
| 92 new changesets 4d1169d82e47 (1 drafts) | 92 new changesets 4d1169d82e47 |
| 93 (run 'hg update' to get a working copy) | 93 (run 'hg update' to get a working copy) |
| 94 | 94 |
| 95 $ hg glog | 95 $ hg glog |
| 96 o 1:4d1169d82e47 modify a | 96 o 1:4d1169d82e47 modify a |
| 97 | () draft | 97 | () draft |
| 268 searching for changes | 268 searching for changes |
| 269 adding changesets | 269 adding changesets |
| 270 adding manifests | 270 adding manifests |
| 271 adding file changes | 271 adding file changes |
| 272 added 1 changesets with 1 changes to 1 files | 272 added 1 changesets with 1 changes to 1 files |
| 273 new changesets aa071e5554e3 (1 drafts) | 273 new changesets aa071e5554e3 |
| 274 (run 'hg update' to get a working copy) | 274 (run 'hg update' to get a working copy) |
| 275 | 275 |
| 276 $ hg push ../public | 276 $ hg push ../public |
| 277 pushing to ../public | 277 pushing to ../public |
| 278 searching for changes | 278 searching for changes |
| 429 searching for changes | 429 searching for changes |
| 430 adding changesets | 430 adding changesets |
| 431 adding manifests | 431 adding manifests |
| 432 adding file changes | 432 adding file changes |
| 433 added 1 changesets with 1 changes to 1 files | 433 added 1 changesets with 1 changes to 1 files |
| 434 new changesets b756eb10ea73 (1 drafts) | 434 new changesets b756eb10ea73 |
| 435 1 local changesets published | 435 1 local changesets published |
| 436 (run 'hg update' to get a working copy) | 436 (run 'hg update' to get a working copy) |
| 437 | 437 |
| 438 $ hg push ../public | 438 $ hg push ../public |
| 439 pushing to ../public | 439 pushing to ../public |
| 561 adding changesets | 561 adding changesets |
| 562 adding manifests | 562 adding manifests |
| 563 adding file changes | 563 adding file changes |
| 564 added 2 changesets with 2 changes to 2 files | 564 added 2 changesets with 2 changes to 2 files |
| 565 2 new obsolescence markers | 565 2 new obsolescence markers |
| 566 new changesets 502e73736632:2352021b3785 (1 drafts) | 566 new changesets 502e73736632:2352021b3785 |
| 567 (run 'hg update' to get a working copy) | 567 (run 'hg update' to get a working copy) |
| 568 $ hg push ../public | 568 $ hg push ../public |
| 569 pushing to ../public | 569 pushing to ../public |
| 570 searching for changes | 570 searching for changes |
| 571 adding changesets | 571 adding changesets |