Mercurial > evolve

comparison tests/test-evolve-list.t @ 4516:f54bb6eaf5e6 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:44:53 +0200
parents a2fdbece7ce1 3caa4a459439
children
comparison
equal deleted inserted replaced
4514:ef1c322c389d 4516:f54bb6eaf5e6
15 $ echo c > c && hg ci -Am c 15 $ echo c > c && hg ci -Am c
16 adding c 16 adding c
17 $ hg up 0 17 $ hg up 0
18 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 18 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
19 $ echo a >> a && hg ci --amend -m a 19 $ echo a >> a && hg ci --amend -m a
20 2 new orphan changesets
21 $ hg evolve --list 20 $ hg evolve --list
22 d2ae7f538514: b 21 d2ae7f538514: b
23 orphan: cb9a9f314b8b (obsolete parent) 22 orphan: cb9a9f314b8b (obsolete parent)
24 23
25 177f92b77385: c 24 177f92b77385: c
32 $ cd r3 31 $ cd r3
33 $ echo a > a && hg ci -Am a 32 $ echo a > a && hg ci -Am a
34 adding a 33 adding a
35 $ echo b > b && hg ci --amend -m ab 34 $ echo b > b && hg ci --amend -m ab
36 $ hg phase --public --rev 0 --hidden 35 $ hg phase --public --rev 0 --hidden
37 1 new phase-divergent changesets
38 $ hg evolve --list 36 $ hg evolve --list
39 88cc282e27fc: ab 37 88cc282e27fc: ab
40 phase-divergent: cb9a9f314b8b (immutable precursor) 38 phase-divergent: cb9a9f314b8b (immutable precursor)
41 39
42 $ cd .. 40 $ cd ..
62 created new head 60 created new head
63 $ hg rebase -s 1 -d 2 61 $ hg rebase -s 1 -d 2
64 rebasing 1:d2ae7f538514 "b" 62 rebasing 1:d2ae7f538514 "b"
65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True 63 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
66 rebasing 1:d2ae7f538514 "b" 64 rebasing 1:d2ae7f538514 "b"
67 2 new content-divergent changesets
68 $ hg evolve --list 65 $ hg evolve --list
69 c882616e9d84: b 66 c882616e9d84: b
70 content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514) 67 content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
71 68
72 a922b3733e98: b 69 a922b3733e98: b