Mercurial > evolve

comparison tests/test-evolve-content-divergent-case-A4.t @ 6809:9903ee44e658 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 18:09:37 +0400
parents 03410b04cf10
children
comparison
equal deleted inserted replaced
6808:c7d3e1d8c6f1 6809:9903ee44e658
82 $ mkcommit D 82 $ mkcommit D
83 created new head 83 created new head
84 $ cd ../local 84 $ cd ../local
85 $ hg pull -qu 85 $ hg pull -qu
86 $ hg rebase -r 'desc(D)' -d 'desc(C)' 86 $ hg rebase -r 'desc(D)' -d 'desc(C)'
87 rebasing 4:6a418860e87b tip "D" 87 rebasing 4:6a418860e87b "D" (tip)
88 88
89 $ cd ../other 89 $ cd ../other
90 $ hg pull -qu 90 $ hg pull -qu
91 $ hg rebase -r 'desc(D)' -d 'desc(B)' 91 $ hg rebase -r 'desc(D)' -d 'desc(B)'
92 rebasing 4:6a418860e87b tip "D" 92 rebasing 4:6a418860e87b "D" (tip)
93 $ hg push -q 93 $ hg push -q
94 94
95 $ cd ../local 95 $ cd ../local
96 $ hg push -q 96 $ hg push -q
97 2 new content-divergent changesets 97 2 new content-divergent changesets