Mercurial > evolve
changeset 3016:d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 25 Sep 2017 02:29:41 +0530 |
| parents | 4b951a9a6895 |
| children | d9e998120771 |
| files | tests/test-topic-dest.t tests/test-topic-rebase.t tests/test-topic-stack.t tests/test-topic-tutorial.t |
| diffstat | 4 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-dest.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-dest.t Mon Sep 25 02:29:41 2017 +0530 @@ -109,7 +109,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 4:cb7ae72f4a80 "babar" + rebasing 4:cb7ae72f4a80 "babar" (elephant) switching to topic elephant $ hg log -G @ 7 (elephant) babar @@ -130,7 +130,7 @@ switching to topic monkey 1 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg rebase - rebasing 5:d832ddc604ec "zephir" + rebasing 5:d832ddc604ec "zephir" (monkey) switching to topic monkey $ hg log -G @ 8 (monkey) zephir @@ -173,7 +173,7 @@ o 0 () c_alpha $ hg rebase - rebasing 9:d79a104e2902 "Huc" (tip) + rebasing 9:d79a104e2902 "Huc" (tip monkey) $ hg log -G @ 10 (monkey) Huc | @@ -225,7 +225,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere - rebasing 7:8d0b77140b05 "babar" + rebasing 7:8d0b77140b05 "babar" (elephant) switching to topic elephant $ hg up monkey switching to topic monkey
--- a/tests/test-topic-rebase.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-rebase.t Mon Sep 25 02:29:41 2017 +0530 @@ -71,7 +71,7 @@ switching to topic myfeature 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 1:39e7a938055e "add feature1" + rebasing 1:39e7a938055e "add feature1" (myfeature) switching to topic myfeature $ hg stack ### topic: myfeature @@ -120,7 +120,7 @@ switching to topic myotherfeature 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 5:81f854012ec5 "myotherfeature1" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature @@ -134,7 +134,7 @@ (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue - rebasing 5:81f854012ec5 "myotherfeature1" + rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) Check the the commit has the right topic
--- a/tests/test-topic-stack.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-stack.t Mon Sep 25 02:29:41 2017 +0530 @@ -328,8 +328,8 @@ Make things linear again $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' - rebasing 4:0f9ac936c87d "c_e" - rebasing 5:6559e6d93aea "c_f" + rebasing 4:0f9ac936c87d "c_e" (foo) + rebasing 5:6559e6d93aea "c_f" (foo) $ hg log -G o 8 default {foo} draft c_f | @@ -397,8 +397,8 @@ $ echo ccc > ddd $ hg commit --amend -m 'c_D' $ hg rebase -d . -s 'desc(c_g)' - rebasing 9:81264ae8a36a "c_g" - rebasing 10:fde5f5941642 "c_h" + rebasing 9:81264ae8a36a "c_g" (foo) + rebasing 10:fde5f5941642 "c_h" (foo) $ hg log -G o 13 default {foo} draft c_h | @@ -463,8 +463,8 @@ Converting into a linear chain $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' - rebasing 7:215bc359096a "c_e" - rebasing 8:ec9267b3f33f "c_f" + rebasing 7:215bc359096a "c_e" (foo) + rebasing 8:ec9267b3f33f "c_f" (foo) $ hg log -G o 15 default {foo} draft c_f @@ -509,16 +509,16 @@ o 0 default {} public c_a $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' - rebasing 15:77082e55de88 "c_f" + rebasing 15:77082e55de88 "c_f" (foo) switching to topic foo switching to topic foobar $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' - rebasing 12:0c3e8aed985d "c_g" + rebasing 12:0c3e8aed985d "c_g" (foo) switching to topic foo - rebasing 13:b9e4f3709bc5 "c_h" - rebasing 16:4bc813530301 "c_e" + rebasing 13:b9e4f3709bc5 "c_h" (foo) + rebasing 16:4bc813530301 "c_e" (foobar) switching to topic foobar - rebasing 18:4406ea4be852 "c_f" (tip) + rebasing 18:4406ea4be852 "c_f" (tip foo) switching to topic foo switching to topic foobar $ hg up
--- a/tests/test-topic-tutorial.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-tutorial.t Mon Sep 25 02:29:41 2017 +0530 @@ -483,10 +483,10 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 1:13900241408b "adding condiments" + rebasing 1:13900241408b "adding condiments" (food) merging shopping switching to topic food - rebasing 2:287de11b401f "adding fruits" + rebasing 2:287de11b401f "adding fruits" (food) merging shopping $ hg log --graph @@ -1034,12 +1034,12 @@ #endif $ hg rebase - rebasing 6:183984ef46d1 "Adding hammer" + rebasing 6:183984ef46d1 "Adding hammer" (tools) merging shopping switching to topic tools - rebasing 7:cffff85af537 "Adding saw" + rebasing 7:cffff85af537 "Adding saw" (tools) merging shopping - rebasing 8:34255b455dac "Adding drill" + rebasing 8:34255b455dac "Adding drill" (tools) merging shopping But what about the other topic? You can use 'hg topics --verbose' to see @@ -1066,10 +1066,10 @@ multiple *public* heads it would create on that branch: $ hg rebase -b drinks - rebasing 9:8dfa45bd5e0c "Adding apple juice" + rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) merging shopping switching to topic drinks - rebasing 10:70dfa201ed73 "Adding orange juice" + rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) merging shopping switching to topic tools @@ -1754,9 +1754,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 19:d5c51ee5762a "Adding saw" + rebasing 19:d5c51ee5762a "Adding saw" (tools) merging shopping - rebasing 20:bae3758e46bf "Adding drill" + rebasing 20:bae3758e46bf "Adding drill" (tools) merging shopping $ hg stack