Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5834:c2484b0217ee mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:49:22 +0800
parents 0f32359bcf3e
children ee54e02d3ea0
comparison
equal deleted inserted replaced
5833:be8f7eb3f3a0 5834:c2484b0217ee
122 $ hg pull ../public 122 $ hg pull ../public
123 pulling from ../public 123 pulling from ../public
124 searching for changes 124 searching for changes
125 no changes found 125 no changes found
126 1 new phase-divergent changesets 126 1 new phase-divergent changesets
127 1 local changesets published
128 127
129 $ hg glog 128 $ hg glog
130 @ 2:98bb3a6cfe1a tweak a 129 @ 2:98bb3a6cfe1a tweak a
131 | () draft 130 | () draft
132 | o 1:4d1169d82e47 modify a 131 | o 1:4d1169d82e47 modify a
292 $ hg pull ../public 291 $ hg pull ../public
293 pulling from ../public 292 pulling from ../public
294 searching for changes 293 searching for changes
295 no changes found 294 no changes found
296 1 new phase-divergent changesets 295 1 new phase-divergent changesets
297 1 local changesets published
298 296
299 $ hg glog 297 $ hg glog
300 @ 4:d47f2b37ed82 added bar to foo 298 @ 4:d47f2b37ed82 added bar to foo
301 | (bm) draft 299 | (bm) draft
302 | o 3:aa071e5554e3 added foo to foo 300 | o 3:aa071e5554e3 added foo to foo
430 adding changesets 428 adding changesets
431 adding manifests 429 adding manifests
432 adding file changes 430 adding file changes
433 added 1 changesets with 1 changes to 1 files 431 added 1 changesets with 1 changes to 1 files
434 new changesets b756eb10ea73 432 new changesets b756eb10ea73
435 1 local changesets published
436 (run 'hg update' to get a working copy) 433 (run 'hg update' to get a working copy)
437 434
438 $ hg push ../public 435 $ hg push ../public
439 pushing to ../public 436 pushing to ../public
440 searching for changes 437 searching for changes
452 $ hg pull ../public 449 $ hg pull ../public
453 pulling from ../public 450 pulling from ../public
454 searching for changes 451 searching for changes
455 no changes found 452 no changes found
456 1 new phase-divergent changesets 453 1 new phase-divergent changesets
457 1 local changesets published
458 454
459 $ hg glog 455 $ hg glog
460 @ 7:2c3560aedead foo to bar 456 @ 7:2c3560aedead foo to bar
461 | (bm) draft 457 | (bm) draft
462 | o 6:b756eb10ea73 added bar to bar 458 | o 6:b756eb10ea73 added bar to bar
583 $ hg pull ../public 579 $ hg pull ../public
584 pulling from ../public 580 pulling from ../public
585 searching for changes 581 searching for changes
586 no changes found 582 no changes found
587 1 new phase-divergent changesets 583 1 new phase-divergent changesets
588 1 local changesets published
589 584
590 $ hg debugobsolete 585 $ hg debugobsolete
591 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} 586 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
592 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 587 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
593 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 588 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}