Mercurial > evolve
comparison tests/test-topic-push.t @ 2985:f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
| author | Aurélien Campéas |
|---|---|
| date | Tue, 26 Sep 2017 12:29:15 +0200 |
| parents | c0de0010ec30 |
| children | 62201935e1a7 |
comparison
equal
deleted
inserted
replaced
| 2984:30f6030dca8f | 2985:f63c97c01f92 |
|---|---|
| 124 ---------------- | 124 ---------------- |
| 125 | 125 |
| 126 $ hg up -r 'desc(CA)' | 126 $ hg up -r 'desc(CA)' |
| 127 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 127 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 128 $ hg topic babar | 128 $ hg topic babar |
| 129 marked working directory as topic: babar | |
| 129 $ echo aaa > ddd | 130 $ echo aaa > ddd |
| 130 $ hg add ddd | 131 $ hg add ddd |
| 131 $ hg commit -m 'CD' | 132 $ hg commit -m 'CD' |
| 132 $ hg log -G # keep track of phase because I saw some strange bug during developement | 133 $ hg log -G # keep track of phase because I saw some strange bug during developement |
| 133 @ 4 default babar draft CD | 134 @ 4 default babar draft CD |
| 235 ------------------ | 236 ------------------ |
| 236 | 237 |
| 237 $ hg up -r 'desc(CA)' | 238 $ hg up -r 'desc(CA)' |
| 238 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 239 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 239 $ hg topic celeste | 240 $ hg topic celeste |
| 241 marked working directory as topic: celeste | |
| 240 $ echo aaa > eee | 242 $ echo aaa > eee |
| 241 $ hg add eee | 243 $ hg add eee |
| 242 $ hg commit -m 'CE' | 244 $ hg commit -m 'CE' |
| 243 $ hg log -G # keep track of phase because I saw some strange bug during developement | 245 $ hg log -G # keep track of phase because I saw some strange bug during developement |
| 244 @ 5 default celeste draft CE | 246 @ 5 default celeste draft CE |
| 323 ---------------------------------------------------- | 325 ---------------------------------------------------- |
| 324 | 326 |
| 325 $ hg up 'desc(CB)' | 327 $ hg up 'desc(CB)' |
| 326 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 328 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 327 $ hg topic babar | 329 $ hg topic babar |
| 330 marked working directory as topic: babar | |
| 328 $ echo aaa > fff | 331 $ echo aaa > fff |
| 329 $ hg add fff | 332 $ hg add fff |
| 330 $ hg commit -m 'CF' | 333 $ hg commit -m 'CF' |
| 331 $ hg log -G | 334 $ hg log -G |
| 332 @ 6 default babar draft CF | 335 @ 6 default babar draft CF |
| 428 $ hg add base | 431 $ hg add base |
| 429 $ hg commit -m 'CBASE' | 432 $ hg commit -m 'CBASE' |
| 430 $ echo aaa > aaa | 433 $ echo aaa > aaa |
| 431 $ hg add aaa | 434 $ hg add aaa |
| 432 $ hg topic topicA | 435 $ hg topic topicA |
| 436 marked working directory as topic: topicA | |
| 433 $ hg commit -m 'CA' | 437 $ hg commit -m 'CA' |
| 434 $ hg up 'desc(CBASE)' | 438 $ hg up 'desc(CBASE)' |
| 435 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 439 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 436 $ echo aaa > bbb | 440 $ echo aaa > bbb |
| 437 $ hg add bbb | 441 $ hg add bbb |
| 438 $ hg topic topicB | 442 $ hg topic topicB |
| 443 marked working directory as topic: topicB | |
| 439 $ hg commit -m 'CB' | 444 $ hg commit -m 'CB' |
| 440 $ cd .. | 445 $ cd .. |
| 441 $ hg push -R repoA repoB | 446 $ hg push -R repoA repoB |
| 442 pushing to repoB | 447 pushing to repoB |
| 443 searching for changes | 448 searching for changes |