Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4886:4ab90c838772 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 05 Oct 2019 13:50:09 -0400 |
parents | 2a500c5e293b |
children | 769b907e644e a7fb433faab6 |
comparison
equal
deleted
inserted
replaced
4885:1bbc4c7873c2 | 4886:4ab90c838772 |
---|---|
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 |
424 searching for changes | 424 searching for changes |
425 adding changesets | 425 adding changesets |
426 adding manifests | 426 adding manifests |
427 adding file changes | 427 adding file changes |
428 added 1 changesets with 1 changes to 1 files | 428 added 1 changesets with 1 changes to 1 files |
429 new changesets b756eb10ea73 (1 drafts) | 429 new changesets b756eb10ea73 |
430 1 local changesets published | 430 1 local changesets published |
431 (run 'hg update' to get a working copy) | 431 (run 'hg update' to get a working copy) |
432 | 432 |
433 $ hg push ../public | 433 $ hg push ../public |
434 pushing to ../public | 434 pushing to ../public |
556 adding changesets | 556 adding changesets |
557 adding manifests | 557 adding manifests |
558 adding file changes | 558 adding file changes |
559 added 2 changesets with 2 changes to 2 files | 559 added 2 changesets with 2 changes to 2 files |
560 2 new obsolescence markers | 560 2 new obsolescence markers |
561 new changesets 502e73736632:2352021b3785 (1 drafts) | 561 new changesets 502e73736632:2352021b3785 |
562 (run 'hg update' to get a working copy) | 562 (run 'hg update' to get a working copy) |
563 $ hg push ../public | 563 $ hg push ../public |
564 pushing to ../public | 564 pushing to ../public |
565 searching for changes | 565 searching for changes |
566 adding changesets | 566 adding changesets |