Mercurial > evolve
comparison tests/test-topic-stack-complex.t @ 3593:b92114f201c9 mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:35:18 +0100 |
| parents | 7a5c3175015e b21a3753255f |
| children |
comparison
equal
deleted
inserted
replaced
| 3592:7a5c3175015e | 3593:b92114f201c9 |
|---|---|
| 10 > [ui] | 10 > [ui] |
| 11 > interactive = True | 11 > interactive = True |
| 12 > [defaults] | 12 > [defaults] |
| 13 > split = -d "0 "0 | 13 > split = -d "0 "0 |
| 14 > [extensions] | 14 > [extensions] |
| 15 > show = | |
| 16 > EOF | 15 > EOF |
| 17 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH | 16 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
| 18 | 17 |
| 19 $ hg init test | 18 $ hg init test |
| 20 $ cd test | 19 $ cd test |
| 31 $ echo d > d | 30 $ echo d > d |
| 32 $ hg ci -Aqm "Added c and d" | 31 $ hg ci -Aqm "Added c and d" |
| 33 $ echo e > e | 32 $ echo e > e |
| 34 $ echo f > f | 33 $ echo f > f |
| 35 $ hg ci -Aqm "Added e and f" | 34 $ hg ci -Aqm "Added e and f" |
| 36 $ hg show work | 35 $ hg log -G |
| 37 @ f1d36 Added e and f | 36 @ changeset: 3:f1d3649d6a8b |
| 38 o 8e825 Added c and d | 37 | tag: tip |
| 39 o 002b8 Added a and b | 38 | topic: foo |
| 40 o f3603 Added foo | 39 | user: test |
| 40 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 41 | summary: Added e and f | |
| 42 | | |
| 43 o changeset: 2:8e8251e8193b | |
| 44 | topic: foo | |
| 45 | user: test | |
| 46 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 47 | summary: Added c and d | |
| 48 | | |
| 49 o changeset: 1:002b85930b9c | |
| 50 | topic: foo | |
| 51 | user: test | |
| 52 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 53 | summary: Added a and b | |
| 54 | | |
| 55 o changeset: 0:f3603c09ac10 | |
| 56 user: test | |
| 57 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 58 summary: Added foo | |
| 59 | |
| 41 | 60 |
| 42 Testing in case of split within the topic | 61 Testing in case of split within the topic |
| 43 | 62 |
| 44 $ hg stack | 63 $ hg stack |
| 45 ### topic: foo | 64 ### topic: foo |
| 91 t3@ split2 (current) | 110 t3@ split2 (current) |
| 92 t2: split1 | 111 t2: split1 |
| 93 t1: Added a and b | 112 t1: Added a and b |
| 94 t0^ Added foo (base) | 113 t0^ Added foo (base) |
| 95 | 114 |
| 96 $ hg show work | 115 $ hg log -G |
| 97 @ 5ccee split2 | 116 @ changeset: 5:5ccee6da565e |
| 98 o f26c1 split1 | 117 | tag: tip |
| 99 | o f1d36 Added e and f | 118 | topic: foo |
| 100 | x 8e825 Added c and d | 119 | user: test |
| 101 |/ | 120 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 102 o 002b8 Added a and b | 121 | summary: split2 |
| 103 o f3603 Added foo | 122 | |
| 123 o changeset: 4:f26c1b9addde | |
| 124 | topic: foo | |
| 125 | parent: 1:002b85930b9c | |
| 126 | user: test | |
| 127 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 128 | summary: split1 | |
| 129 | | |
| 130 | o changeset: 3:f1d3649d6a8b | |
| 131 | | topic: foo | |
| 132 | | user: test | |
| 133 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 134 | | trouble: unstable | |
| 135 | | summary: Added e and f | |
| 136 | | | |
| 137 | x changeset: 2:8e8251e8193b | |
| 138 |/ topic: foo | |
| 139 | user: test | |
| 140 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 141 | summary: Added c and d | |
| 142 | | |
| 143 o changeset: 1:002b85930b9c | |
| 144 | topic: foo | |
| 145 | user: test | |
| 146 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 147 | summary: Added a and b | |
| 148 | | |
| 149 o changeset: 0:f3603c09ac10 | |
| 150 user: test | |
| 151 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 152 summary: Added foo | |
| 153 | |
| 104 | 154 |
| 105 $ hg prev | 155 $ hg prev |
| 106 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 156 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 107 [4] split1 | 157 [4] split1 |
| 108 $ echo foo > c | 158 $ echo foo > c |
| 114 -c | 164 -c |
| 115 +foo | 165 +foo |
| 116 | 166 |
| 117 $ hg amend | 167 $ hg amend |
| 118 1 new unstable changesets | 168 1 new unstable changesets |
| 119 $ hg show work | 169 |
| 120 @ 7d944 split1 | 170 $ hg log -G |
| 121 | o 5ccee split2 | 171 @ changeset: 7:7d9445714d83 |
| 122 | x f26c1 split1 | 172 | tag: tip |
| 123 |/ | 173 | topic: foo |
| 124 | o f1d36 Added e and f | 174 | parent: 1:002b85930b9c |
| 125 | x 8e825 Added c and d | 175 | user: test |
| 126 |/ | 176 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 127 o 002b8 Added a and b | 177 | summary: split1 |
| 128 o f3603 Added foo | 178 | |
| 179 | o changeset: 5:5ccee6da565e | |
| 180 | | topic: foo | |
| 181 | | user: test | |
| 182 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 183 | | trouble: unstable | |
| 184 | | summary: split2 | |
| 185 | | | |
| 186 | x changeset: 4:f26c1b9addde | |
| 187 |/ topic: foo | |
| 188 | parent: 1:002b85930b9c | |
| 189 | user: test | |
| 190 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 191 | summary: split1 | |
| 192 | | |
| 193 | o changeset: 3:f1d3649d6a8b | |
| 194 | | topic: foo | |
| 195 | | user: test | |
| 196 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 197 | | trouble: unstable | |
| 198 | | summary: Added e and f | |
| 199 | | | |
| 200 | x changeset: 2:8e8251e8193b | |
| 201 |/ topic: foo | |
| 202 | user: test | |
| 203 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 204 | summary: Added c and d | |
| 205 | | |
| 206 o changeset: 1:002b85930b9c | |
| 207 | topic: foo | |
| 208 | user: test | |
| 209 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 210 | summary: Added a and b | |
| 211 | | |
| 212 o changeset: 0:f3603c09ac10 | |
| 213 user: test | |
| 214 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 215 summary: Added foo | |
| 216 | |
| 129 | 217 |
| 130 $ hg stack | 218 $ hg stack |
| 131 ### topic: foo (2 heads) | 219 ### topic: foo (2 heads) |
| 132 ### target: default (branch), 2 behind | 220 ### target: default (branch), 2 behind |
| 133 t4$ Added e and f (unstable) | 221 t4$ Added e and f (unstable) |