Mercurial > evolve
comparison tests/test-stack-branch.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | d5adce52cef4 |
| children | 98941c28f3e2 f9a850018daa |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 107 Case with some of the branch unstable | 107 Case with some of the branch unstable |
| 108 ------------------------------------ | 108 ------------------------------------ |
| 109 | 109 |
| 110 $ echo bbb > ddd | 110 $ echo bbb > ddd |
| 111 $ hg commit --amend | 111 $ hg commit --amend |
| 112 2 new orphan changesets | |
| 113 $ hg log -G | 112 $ hg log -G |
| 114 @ 6 foo {} draft c_d | 113 @ 6 foo {} draft c_d |
| 115 | | 114 | |
| 116 | * 5 foo {} draft c_f | 115 | o 5 foo {} draft c_f |
| 117 | | | 116 | | |
| 118 | * 4 foo {} draft c_e | 117 | o 4 foo {} draft c_e |
| 119 | | | 118 | | |
| 120 | x 3 foo {} draft c_d | 119 | x 3 foo {} draft c_d |
| 121 |/ | 120 |/ |
| 122 o 2 foo {} draft c_c | 121 o 2 foo {} draft c_c |
| 123 | | 122 | |
| 224 | 223 |
| 225 $ hg up 'desc(c_d)' | 224 $ hg up 'desc(c_d)' |
| 226 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 225 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 227 $ echo ccc > ddd | 226 $ echo ccc > ddd |
| 228 $ hg commit --amend -m 'c_D' | 227 $ hg commit --amend -m 'c_D' |
| 229 4 new orphan changesets | |
| 230 $ hg rebase -d . -s 'desc(c_g)' | 228 $ hg rebase -d . -s 'desc(c_g)' |
| 231 rebasing 9:2ebb6e48ab8a "c_g" | 229 rebasing 9:2ebb6e48ab8a "c_g" |
| 232 rebasing 10:634f38e27a1d "c_h" | 230 rebasing 10:634f38e27a1d "c_h" |
| 233 $ hg log -G | 231 $ hg log -G |
| 234 o 13 foo {} draft c_h | 232 o 13 foo {} draft c_h |
| 235 | | 233 | |
| 236 o 12 foo {} draft c_g | 234 o 12 foo {} draft c_g |
| 237 | | 235 | |
| 238 @ 11 foo {} draft c_D | 236 @ 11 foo {} draft c_D |
| 239 | | 237 | |
| 240 | * 8 foo {} draft c_f | 238 | o 8 foo {} draft c_f |
| 241 | | | 239 | | |
| 242 | * 7 foo {} draft c_e | 240 | o 7 foo {} draft c_e |
| 243 | | | 241 | | |
| 244 | x 6 foo {} draft c_d | 242 | x 6 foo {} draft c_d |
| 245 |/ | 243 |/ |
| 246 o 2 foo {} draft c_c | 244 o 2 foo {} draft c_c |
| 247 | | 245 | |
| 269 | | 267 | |
| 270 o 12 foo {} draft c_g | 268 o 12 foo {} draft c_g |
| 271 | | 269 | |
| 272 @ 11 foo {} draft c_D | 270 @ 11 foo {} draft c_D |
| 273 | | 271 | |
| 274 | * 8 foo {} draft c_f | 272 | o 8 foo {} draft c_f |
| 275 | | | 273 | | |
| 276 | * 7 foo {} draft c_e | 274 | o 7 foo {} draft c_e |
| 277 | | | 275 | | |
| 278 | x 6 foo {} draft c_d | 276 | x 6 foo {} draft c_d |
| 279 |/ | 277 |/ |
| 280 o 2 foo {} draft c_c | 278 o 2 foo {} draft c_c |
| 281 | | 279 | |