equal
deleted
inserted
replaced
3 > [extensions] |
3 > [extensions] |
4 > rebase= |
4 > rebase= |
5 > EOF |
5 > EOF |
6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
7 |
7 |
8 Test the instability listing |
8 Test listing orphan changesets |
9 $ hg init r2 |
9 $ hg init r2 |
10 $ cd r2 |
10 $ cd r2 |
11 $ echo a > a && hg ci -Am a |
11 $ echo a > a && hg ci -Am a |
12 adding a |
12 adding a |
13 $ echo b > b && hg ci -Am b |
13 $ echo b > b && hg ci -Am b |
25 177f92b77385: c |
25 177f92b77385: c |
26 orphan: d2ae7f538514 (orphan parent) |
26 orphan: d2ae7f538514 (orphan parent) |
27 |
27 |
28 $ cd .. |
28 $ cd .. |
29 |
29 |
30 Test the bumpedness listing |
30 Test listing phase-divergent changesets |
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 |
39 88cc282e27fc: ab |
39 88cc282e27fc: ab |
40 phase-divergent: cb9a9f314b8b (immutable precursor) |
40 phase-divergent: cb9a9f314b8b (immutable precursor) |
41 |
41 |
42 $ cd .. |
42 $ cd .. |
43 |
43 |
44 Test the divergence listing |
44 Test listing content-divergent changesets |
45 $ hg init r1 |
45 $ hg init r1 |
46 $ cd r1 |
46 $ cd r1 |
47 $ echo a > a && hg ci -Am a |
47 $ echo a > a && hg ci -Am a |
48 adding a |
48 adding a |
49 $ hg up 0 |
49 $ hg up 0 |