Mercurial > evolve

comparison tests/test-evolve-list.t @ 4207:3d917da5bd95 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 25 Oct 2018 16:33:10 +0200
parents 85cdce113c2c
children
comparison
equal deleted inserted replaced
4206:04aeaec6ec07 4207:3d917da5bd95
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 20 2 new unstable changesets
21 $ hg evolve --list 21 $ hg evolve --list
22 d2ae7f538514: b 22 d2ae7f538514: b
23 orphan: cb9a9f314b8b (obsolete parent) 23 unstable: cb9a9f314b8b (obsolete parent)
24 24
25 177f92b77385: c 25 177f92b77385: c
26 orphan: d2ae7f538514 (orphan parent) 26 unstable: d2ae7f538514 (unstable parent)
27 27
28 $ cd .. 28 $ cd ..
29 29
30 Test the bumpedness listing 30 Test the bumpedness listing
31 $ hg init r3 31 $ hg init r3
32 $ cd r3 32 $ cd r3
33 $ echo a > a && hg ci -Am a 33 $ echo a > a && hg ci -Am a
34 adding a 34 adding a
35 $ echo b > b && hg ci --amend -m ab 35 $ echo b > b && hg ci --amend -m ab
36 $ hg phase --public --rev 0 --hidden 36 $ hg phase --public --rev 0 --hidden
37 1 new phase-divergent changesets 37 1 new bumped changesets
38 $ hg evolve --list 38 $ hg evolve --list
39 88cc282e27fc: ab 39 88cc282e27fc: ab
40 phase-divergent: cb9a9f314b8b (immutable precursor) 40 bumped: cb9a9f314b8b (immutable precursor)
41 41
42 $ cd .. 42 $ cd ..
43 43
44 Test the divergence listing 44 Test the divergence listing
45 $ hg init r1 45 $ hg init r1
62 created new head 62 created new head
63 $ hg rebase -s 1 -d 2 63 $ hg rebase -s 1 -d 2
64 rebasing 1:d2ae7f538514 "b" 64 rebasing 1:d2ae7f538514 "b"
65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True 65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
66 rebasing 1:d2ae7f538514 "b" 66 rebasing 1:d2ae7f538514 "b"
67 2 new content-divergent changesets 67 2 new divergent changesets
68 $ hg evolve --list 68 $ hg evolve --list
69 c882616e9d84: b 69 c882616e9d84: b
70 content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514) 70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
71 71
72 a922b3733e98: b 72 a922b3733e98: b
73 content-divergent: c882616e9d84 (draft) (precursor d2ae7f538514) 73 divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
74 74
75 $ hg evolve --list --rev c882616e9d84 75 $ hg evolve --list --rev c882616e9d84
76 c882616e9d84: b 76 c882616e9d84: b
77 content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514) 77 divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
78 78
79 $ hg phase -p a922b3733e98 79 $ hg phase -p a922b3733e98
80 $ hg evolve --list 80 $ hg evolve --list
81 c882616e9d84: b 81 c882616e9d84: b
82 content-divergent: a922b3733e98 (public) (precursor d2ae7f538514) 82 divergent: a922b3733e98 (public) (precursor d2ae7f538514)
83 83
84 $ cd .. 84 $ cd ..