Mercurial > evolve

comparison tests/test-evolve-content-divergent-relocation.t @ 5706:59b2be90e9fd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rebase now produces different "one-line summary" output CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 29 Oct 2020 09:19:37 -0700
parents d7d954b6d518
children e5d91fd1f319
comparison
equal deleted inserted replaced
5691:6eb9f82b43ba 5706:59b2be90e9fd
625 $ echo 0 > b 625 $ echo 0 > b
626 $ hg ci -Aqm divergent 626 $ hg ci -Aqm divergent
627 627
628 The first side of the divergence get rebased on top of upstream. 628 The first side of the divergence get rebased on top of upstream.
629 $ hg rebase -r . -d 'desc("upstream")' 629 $ hg rebase -r . -d 'desc("upstream")'
630 rebasing 2:898ddd4443b3 "divergent" (tip) 630 rebasing 2:898ddd4443b3 tip "divergent"
631 $ hg --hidden co 2 -q 631 $ hg --hidden co 2 -q
632 updated to hidden changeset 898ddd4443b3 632 updated to hidden changeset 898ddd4443b3
633 (hidden revision '898ddd4443b3' was rewritten as: befae6138569) 633 (hidden revision '898ddd4443b3' was rewritten as: befae6138569)
634 working directory parent is obsolete! (898ddd4443b3) 634 working directory parent is obsolete! (898ddd4443b3)
635 635