Mercurial > evolve
comparison tests/test-evolve-topic.t @ 4076:f9a850018daa mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 22:06:12 +0200 |
| parents | d00f0c369bc7 fb4801478d5d |
| children | 9c025ec4af88 e268f7fd7839 |
comparison
equal
deleted
inserted
replaced
| 4032:fc065ec30351 | 4076:f9a850018daa |
|---|---|
| 78 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 78 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 79 $ hg topic -l | 79 $ hg topic -l |
| 80 ### topic: foo (?) | 80 ### topic: foo (?) |
| 81 ### branch: default (?) | 81 ### branch: default (?) |
| 82 ### target: default (branch) | 82 ### target: default (branch) |
| 83 t4@ add fff (current) | 83 s4@ add fff (current) |
| 84 t3: add eee | 84 s3: add eee |
| 85 t2: add ddd | 85 s2: add ddd |
| 86 t1: add ccc | 86 s1: add ccc |
| 87 t0^ add bbb (base) | 87 s0^ add bbb (base) |
| 88 $ hg up 'desc(ddd)' | 88 $ hg up 'desc(ddd)' |
| 89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 90 $ echo ddd >> ddd | 90 $ echo ddd >> ddd |
| 91 $ hg amend | 91 $ hg amend |
| 92 6 new orphan changesets | 92 6 new orphan changesets |
| 257 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 257 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 258 | 258 |
| 259 $ hg stack | 259 $ hg stack |
| 260 ### topic: bar | 260 ### topic: bar |
| 261 ### target: default (branch) | 261 ### target: default (branch) |
| 262 t5$ add jjj (unstable) | 262 s5$ add jjj (unstable) |
| 263 t4$ add iii (unstable) | 263 s4$ add iii (unstable) |
| 264 t3$ add hhh (unstable) | 264 s3$ add hhh (unstable) |
| 265 t2$ add ggg (current unstable) | 265 s2$ add ggg (current unstable) |
| 266 t1: add fff | 266 s1: add fff |
| 267 t0^ add eee (base) | 267 s0^ add eee (base) |
| 268 | 268 |
| 269 $ hg prev | 269 $ hg prev |
| 270 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 270 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 271 [18] add fff | 271 [18] add fff |
| 272 | 272 |