|
1 This test file test the #6028 issue |
|
2 |
|
3 evolve fails with mercurial.error.ProgrammingError: unsupported changeid '' of type <type 'str'> |
|
4 |
|
5 https://bz.mercurial-scm.org/show_bug.cgi?id=6028 |
|
6 |
|
7 Global setup |
|
8 ============ |
|
9 |
|
10 $ . $TESTDIR/testlib/common.sh |
|
11 $ cat >> $HGRCPATH <<EOF |
|
12 > [ui] |
|
13 > interactive = true |
|
14 > [phases] |
|
15 > publish=False |
|
16 > [extensions] |
|
17 > evolve = |
|
18 > topic = |
|
19 > EOF |
|
20 |
|
21 Test |
|
22 ==== |
|
23 |
|
24 $ hg init $TESTTMP/issue-6028 |
|
25 $ cd $TESTTMP/issue-6028 |
|
26 |
|
27 create initial commit |
|
28 $ echo "0" > 0 |
|
29 $ hg ci -Am 0 |
|
30 adding 0 |
|
31 |
|
32 |
|
33 $ hg up default |
|
34 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 $ hg topics a |
|
36 marked working directory as topic: a |
|
37 $ echo "a" > a |
|
38 $ hg ci -Am a |
|
39 adding a |
|
40 active topic 'a' grew its first changeset |
|
41 (see 'hg help topics' for more information) |
|
42 |
|
43 |
|
44 $ hg up default |
|
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
46 $ hg topics b |
|
47 marked working directory as topic: b |
|
48 $ echo "b" > b |
|
49 $ hg ci -Am b |
|
50 adding b |
|
51 active topic 'b' grew its first changeset |
|
52 (see 'hg help topics' for more information) |
|
53 |
|
54 $ hg up default |
|
55 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
56 $ hg branch integration |
|
57 marked working directory as branch integration |
|
58 |
|
59 $ hg merge a |
|
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 (branch merge, don't forget to commit) |
|
62 $ hg ci -m "merged a" |
|
63 |
|
64 $ hg merge b |
|
65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 (branch merge, don't forget to commit) |
|
67 $ hg ci -m "merged b" |
|
68 |
|
69 $ hg up a |
|
70 switching to topic a |
|
71 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
72 $ echo "a bad commit" >> a_bad_commit |
|
73 $ hg add a_bad_commit |
|
74 $ hg ci -m "a bad commit" |
|
75 $ hg up integration |
|
76 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
77 $ hg merge a |
|
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 (branch merge, don't forget to commit) |
|
80 $ hg ci -m "merged a bad commit" |
|
81 |
|
82 $ hg up a |
|
83 switching to topic a |
|
84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
85 $ echo "aa" >> a |
|
86 $ hg ci -m "aa" |
|
87 $ hg up integration |
|
88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 $ hg merge a |
|
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 (branch merge, don't forget to commit) |
|
92 $ hg ci -m "merged aa" |
|
93 |
|
94 $ hg up b |
|
95 switching to topic b |
|
96 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
97 $ echo "bb" >> b |
|
98 $ hg ci -m "bb" |
|
99 $ hg up integration |
|
100 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 $ hg merge b |
|
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 (branch merge, don't forget to commit) |
|
104 $ hg ci -m "merged bb" |
|
105 |
|
106 create instability by pruning two changesets, one in a topic, one in a merge |
|
107 $ hg prune -r 5:6 |
|
108 2 changesets pruned |
|
109 3 new orphan changesets |
|
110 |
|
111 $ hg up 4 |
|
112 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
113 |
|
114 start the evolve |
|
115 $ hg evolve |
|
116 move:[8] merged aa |
|
117 atop:[4] merged b |
|
118 working directory is now at c920dd828523 |
|
119 |
|
120 evolve creates an obsolete changeset above as 11 |
|
121 $ hg evolve -r . |
|
122 cannot solve instability of c920dd828523, skipping |
|
123 cannot solve instability of c920dd828523, skipping |