Mercurial > evolve
comparison tests/test-stack-branch.t @ 3105:f5d472b7e800 mercurial-4.3
test-compat: revert output changes related to temporary amend commit
This backed out changeset 06844693bb21 and other related changes.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 19:32:18 +0200 |
| parents | 3eca2cbdc498 |
| children | 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
| 3104:3dd5a6f83f8b | 3105:f5d472b7e800 |
|---|---|
| 108 ------------------------------------ | 108 ------------------------------------ |
| 109 | 109 |
| 110 $ echo bbb > ddd | 110 $ echo bbb > ddd |
| 111 $ hg commit --amend | 111 $ hg commit --amend |
| 112 $ hg log -G | 112 $ hg log -G |
| 113 @ 6 foo {} draft c_d | 113 @ 7 foo {} draft c_d |
| 114 | | 114 | |
| 115 | o 5 foo {} draft c_f | 115 | o 5 foo {} draft c_f |
| 116 | | | 116 | | |
| 117 | o 4 foo {} draft c_e | 117 | o 4 foo {} draft c_e |
| 118 | | | 118 | | |
| 145 | 145 |
| 146 Also test the revset: | 146 Also test the revset: |
| 147 | 147 |
| 148 $ hg log -r 'stack()' | 148 $ hg log -r 'stack()' |
| 149 2 foo {} draft c_c | 149 2 foo {} draft c_c |
| 150 6 foo {} draft c_d | 150 7 foo {} draft c_d |
| 151 4 foo {} draft c_e | 151 4 foo {} draft c_e |
| 152 5 foo {} draft c_f | 152 5 foo {} draft c_f |
| 153 | 153 |
| 154 Case with multiple heads on the topic | 154 Case with multiple heads on the topic |
| 155 ------------------------------------- | 155 ------------------------------------- |
| 158 | 158 |
| 159 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' | 159 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
| 160 rebasing 4:4f2a69f6d380 "c_e" | 160 rebasing 4:4f2a69f6d380 "c_e" |
| 161 rebasing 5:913c298d8b0a "c_f" | 161 rebasing 5:913c298d8b0a "c_f" |
| 162 $ hg log -G | 162 $ hg log -G |
| 163 o 8 foo {} draft c_f | 163 o 9 foo {} draft c_f |
| 164 | | 164 | |
| 165 o 7 foo {} draft c_e | 165 o 8 foo {} draft c_e |
| 166 | | 166 | |
| 167 @ 6 foo {} draft c_d | 167 @ 7 foo {} draft c_d |
| 168 | | 168 | |
| 169 o 2 foo {} draft c_c | 169 o 2 foo {} draft c_c |
| 170 | | 170 | |
| 171 o 1 other {} public c_b | 171 o 1 other {} public c_b |
| 172 | | 172 | |
| 183 created new head | 183 created new head |
| 184 $ echo aaa > hhh | 184 $ echo aaa > hhh |
| 185 $ hg add hhh | 185 $ hg add hhh |
| 186 $ hg commit -m c_h | 186 $ hg commit -m c_h |
| 187 $ hg log -G | 187 $ hg log -G |
| 188 @ 10 foo {} draft c_h | 188 @ 11 foo {} draft c_h |
| 189 | | 189 | |
| 190 o 9 foo {} draft c_g | 190 o 10 foo {} draft c_g |
| 191 | | 191 | |
| 192 | o 8 foo {} draft c_f | 192 | o 9 foo {} draft c_f |
| 193 | | | 193 | | |
| 194 | o 7 foo {} draft c_e | 194 | o 8 foo {} draft c_e |
| 195 |/ | 195 |/ |
| 196 o 6 foo {} draft c_d | 196 o 7 foo {} draft c_d |
| 197 | | 197 | |
| 198 o 2 foo {} draft c_c | 198 o 2 foo {} draft c_c |
| 199 | | 199 | |
| 200 o 1 other {} public c_b | 200 o 1 other {} public c_b |
| 201 | | 201 | |
| 204 | 204 |
| 205 Test output | 205 Test output |
| 206 | 206 |
| 207 $ hg stack | 207 $ hg stack |
| 208 ### target: foo (branch) (2 heads) | 208 ### target: foo (branch) (2 heads) |
| 209 b6@ c_h (current) | 209 b6: c_f |
| 210 b5: c_g | 210 b5: c_e |
| 211 b2^ c_d (base) | 211 b2^ c_d (base) |
| 212 b4: c_f | 212 b4@ c_h (current) |
| 213 b3: c_e | 213 b3: c_g |
| 214 b2: c_d | 214 b2: c_d |
| 215 b1: c_c | 215 b1: c_c |
| 216 b0^ c_b (base) | 216 b0^ c_b (base) |
| 217 | 217 |
| 218 Case with multiple heads on the topic with unstability involved | 218 Case with multiple heads on the topic with unstability involved |
| 223 $ hg up 'desc(c_d)' | 223 $ hg up 'desc(c_d)' |
| 224 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 224 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 225 $ echo ccc > ddd | 225 $ echo ccc > ddd |
| 226 $ hg commit --amend -m 'c_D' | 226 $ hg commit --amend -m 'c_D' |
| 227 $ hg rebase -d . -s 'desc(c_g)' | 227 $ hg rebase -d . -s 'desc(c_g)' |
| 228 rebasing 9:2ebb6e48ab8a "c_g" | 228 rebasing 10:2ebb6e48ab8a "c_g" |
| 229 rebasing 10:634f38e27a1d "c_h" | 229 rebasing 11:634f38e27a1d "c_h" |
| 230 $ hg log -G | 230 $ hg log -G |
| 231 o 13 foo {} draft c_h | 231 o 15 foo {} draft c_h |
| 232 | | 232 | |
| 233 o 12 foo {} draft c_g | 233 o 14 foo {} draft c_g |
| 234 | | 234 | |
| 235 @ 11 foo {} draft c_D | 235 @ 13 foo {} draft c_D |
| 236 | | 236 | |
| 237 | o 8 foo {} draft c_f | 237 | o 9 foo {} draft c_f |
| 238 | | | 238 | | |
| 239 | o 7 foo {} draft c_e | 239 | o 8 foo {} draft c_e |
| 240 | | | 240 | | |
| 241 | x 6 foo {} draft c_d | 241 | x 7 foo {} draft c_d |
| 242 |/ | 242 |/ |
| 243 o 2 foo {} draft c_c | 243 o 2 foo {} draft c_c |
| 244 | | 244 | |
| 245 o 1 other {} public c_b | 245 o 1 other {} public c_b |
| 246 | | 246 | |
| 247 o 0 other {} public c_a | 247 o 0 other {} public c_a |
| 248 | 248 |
| 249 | 249 |
| 250 $ hg stack | 250 $ hg stack |
| 251 ### target: foo (branch) (2 heads) | 251 ### target: foo (branch) (2 heads) |
| 252 b6: c_h | 252 b6$ c_f (unstable) |
| 253 b5: c_g | 253 b5$ c_e (unstable) |
| 254 b2^ c_D (base current) | 254 b2^ c_D (base current) |
| 255 b4$ c_f (unstable) | 255 b4: c_h |
| 256 b3$ c_e (unstable) | 256 b3: c_g |
| 257 b2@ c_D (current) | 257 b2@ c_D (current) |
| 258 b1: c_c | 258 b1: c_c |
| 259 b0^ c_b (base) | 259 b0^ c_b (base) |
| 260 | 260 |
| 261 Check that stack doesn't show draft changesets on a branch | 261 Check that stack doesn't show draft changesets on a branch |
| 262 ---------------------------------------------------------- | 262 ---------------------------------------------------------- |
| 263 | 263 |
| 264 $ hg log --graph | 264 $ hg log --graph |
| 265 o 13 foo {} draft c_h | 265 o 15 foo {} draft c_h |
| 266 | | 266 | |
| 267 o 12 foo {} draft c_g | 267 o 14 foo {} draft c_g |
| 268 | | 268 | |
| 269 @ 11 foo {} draft c_D | 269 @ 13 foo {} draft c_D |
| 270 | | 270 | |
| 271 | o 8 foo {} draft c_f | 271 | o 9 foo {} draft c_f |
| 272 | | | 272 | | |
| 273 | o 7 foo {} draft c_e | 273 | o 8 foo {} draft c_e |
| 274 | | | 274 | | |
| 275 | x 6 foo {} draft c_d | 275 | x 7 foo {} draft c_d |
| 276 |/ | 276 |/ |
| 277 o 2 foo {} draft c_c | 277 o 2 foo {} draft c_c |
| 278 | | 278 | |
| 279 o 1 other {} public c_b | 279 o 1 other {} public c_b |
| 280 | | 280 | |
| 281 o 0 other {} public c_a | 281 o 0 other {} public c_a |
| 282 | 282 |
| 283 | 283 |
| 284 $ hg stack | 284 $ hg stack |
| 285 ### target: foo (branch) (2 heads) | 285 ### target: foo (branch) (2 heads) |
| 286 b6: c_h | 286 b6$ c_f (unstable) |
| 287 b5: c_g | 287 b5$ c_e (unstable) |
| 288 b2^ c_D (base current) | 288 b2^ c_D (base current) |
| 289 b4$ c_f (unstable) | 289 b4: c_h |
| 290 b3$ c_e (unstable) | 290 b3: c_g |
| 291 b2@ c_D (current) | 291 b2@ c_D (current) |
| 292 b1: c_c | 292 b1: c_c |
| 293 b0^ c_b (base) | 293 b0^ c_b (base) |
| 294 $ hg phase --public b1 | 294 $ hg phase --public b1 |
| 295 $ hg stack | 295 $ hg stack |
| 296 ### target: foo (branch) (2 heads) | 296 ### target: foo (branch) (2 heads) |
| 297 b5: c_h | 297 b5$ c_f (unstable) |
| 298 b4: c_g | 298 b4$ c_e (unstable) |
| 299 b1^ c_D (base current) | 299 b1^ c_D (base current) |
| 300 b3$ c_f (unstable) | 300 b3: c_h |
| 301 b2$ c_e (unstable) | 301 b2: c_g |
| 302 b1@ c_D (current) | 302 b1@ c_D (current) |
| 303 b0^ c_c (base) | 303 b0^ c_c (base) |
| 304 | 304 |
| 305 Check that stack doesn't show changeset with a topic | 305 Check that stack doesn't show changeset with a topic |
| 306 ---------------------------------------------------- | 306 ---------------------------------------------------- |
| 307 | 307 |
| 308 $ hg topic --rev b4::b5 sometopic | 308 $ hg topic --rev b4::b5 sometopic |
| 309 changed topic on 2 changes | 309 changed topic on 2 changes |
| 310 $ hg stack | 310 $ hg stack |
| 311 ### target: foo (branch) | 311 ### target: foo (branch) |
| 312 b3$ c_f (unstable) | 312 b3: c_h |
| 313 b2$ c_e (unstable) | 313 b2: c_g |
| 314 b1@ c_D (current) | 314 b1@ c_D (current) |
| 315 b0^ c_c (base) | 315 b0^ c_c (base) |