Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 3933:1194c850fe2a mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 00:19:45 +0200 |
| parents | 299748f72527 |
| children | d00f0c369bc7 e541acefbaa5 |
comparison
equal
deleted
inserted
replaced
| 3932:35b2d201eb71 | 3933:1194c850fe2a |
|---|---|
| 113 $ hg pull ../public | 113 $ hg pull ../public |
| 114 pulling from ../public | 114 pulling from ../public |
| 115 searching for changes | 115 searching for changes |
| 116 no changes found | 116 no changes found |
| 117 1 new phase-divergent changesets | 117 1 new phase-divergent changesets |
| 118 1 local changesets published | |
| 119 | 118 |
| 120 $ hg glog | 119 $ hg glog |
| 121 @ 2:98bb3a6cfe1a tweak a | 120 @ 2:98bb3a6cfe1a tweak a |
| 122 | () draft | 121 | () draft |
| 123 | o 1:4d1169d82e47 modify a | 122 | o 1:4d1169d82e47 modify a |
| 282 $ hg pull ../public | 281 $ hg pull ../public |
| 283 pulling from ../public | 282 pulling from ../public |
| 284 searching for changes | 283 searching for changes |
| 285 no changes found | 284 no changes found |
| 286 1 new phase-divergent changesets | 285 1 new phase-divergent changesets |
| 287 1 local changesets published | |
| 288 | 286 |
| 289 $ hg glog | 287 $ hg glog |
| 290 @ 4:d47f2b37ed82 added bar to foo | 288 @ 4:d47f2b37ed82 added bar to foo |
| 291 | (bm) draft | 289 | (bm) draft |
| 292 | o 3:aa071e5554e3 added foo to foo | 290 | o 3:aa071e5554e3 added foo to foo |
| 413 adding changesets | 411 adding changesets |
| 414 adding manifests | 412 adding manifests |
| 415 adding file changes | 413 adding file changes |
| 416 added 1 changesets with 1 changes to 1 files | 414 added 1 changesets with 1 changes to 1 files |
| 417 new changesets b756eb10ea73 | 415 new changesets b756eb10ea73 |
| 418 1 local changesets published | |
| 419 (run 'hg update' to get a working copy) | 416 (run 'hg update' to get a working copy) |
| 420 | 417 |
| 421 $ hg push ../public | 418 $ hg push ../public |
| 422 pushing to ../public | 419 pushing to ../public |
| 423 searching for changes | 420 searching for changes |
| 435 $ hg pull ../public | 432 $ hg pull ../public |
| 436 pulling from ../public | 433 pulling from ../public |
| 437 searching for changes | 434 searching for changes |
| 438 no changes found | 435 no changes found |
| 439 1 new phase-divergent changesets | 436 1 new phase-divergent changesets |
| 440 1 local changesets published | |
| 441 | 437 |
| 442 $ hg glog | 438 $ hg glog |
| 443 @ 7:2c3560aedead foo to bar | 439 @ 7:2c3560aedead foo to bar |
| 444 | (bm) draft | 440 | (bm) draft |
| 445 | o 6:b756eb10ea73 added bar to bar | 441 | o 6:b756eb10ea73 added bar to bar |
| 565 $ hg pull ../public | 561 $ hg pull ../public |
| 566 pulling from ../public | 562 pulling from ../public |
| 567 searching for changes | 563 searching for changes |
| 568 no changes found | 564 no changes found |
| 569 1 new phase-divergent changesets | 565 1 new phase-divergent changesets |
| 570 1 local changesets published | |
| 571 | 566 |
| 572 $ hg obslog -r . | 567 $ hg obslog -r . |
| 573 @ 334e300d6db5 (10) added x to x | 568 @ 334e300d6db5 (10) added x to x |
| 574 | | 569 | |
| 575 o 2352021b3785 (9) added x to x | 570 o 2352021b3785 (9) added x to x |