This instance was upgraded to Heptapod 0.19.0 (final) today

Commit 38d7a16f authored by Martin von Zweigbergk's avatar Martin von Zweigbergk

tests: rebase now produces different "one-line summary" output

CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
parent 4c1eb455259f
Pipeline #13286 failed with stage
in 6 minutes and 11 seconds
......@@ -79,7 +79,7 @@ initial
$ cd ../local
$ hg pull -qu
$ hg rebase -r 'desc(C)' -d 'desc(B)'
rebasing 3:928c8849ec01 "C" (tip)
rebasing 3:928c8849ec01 tip "C"
$ cd ../other
$ hg pull -qu
......
......@@ -84,12 +84,12 @@ initial
$ cd ../local
$ hg pull -qu
$ hg rebase -r 'desc(D)' -d 'desc(C)'
rebasing 4:6a418860e87b "D" (tip)
rebasing 4:6a418860e87b tip "D"
$ cd ../other
$ hg pull -qu
$ hg rebase -r 'desc(D)' -d 'desc(B)'
rebasing 4:6a418860e87b "D" (tip)
rebasing 4:6a418860e87b tip "D"
$ hg push -q
$ cd ../local
......
......@@ -274,7 +274,7 @@ is parent of one of the divergents and relocating leads to conflicts
() draft
$ hg rebase -r . -d .^^^ --config extensions.rebase=
rebasing 4:c41c793e0ef1 "added d" (tip)
rebasing 4:c41c793e0ef1 tip "added d"
$ echo bar > c
$ hg add c
$ hg amend
......@@ -485,7 +485,7 @@ merging
---------------------------------------------------------------------------
$ hg rebase -r . -d .^^^ --config extensions.rebase=
rebasing 6:9c1631e352d9 "added d" (tip)
rebasing 6:9c1631e352d9 tip "added d"
$ hg glog
@ 7:517d4375cb72 added d
......
......@@ -627,7 +627,7 @@ Create the source of divergence.
The first side of the divergence get rebased on top of upstream.
$ hg rebase -r . -d 'desc("upstream")'
rebasing 2:898ddd4443b3 "divergent" (tip)
rebasing 2:898ddd4443b3 tip "divergent"
$ hg --hidden co 2 -q
updated to hidden changeset 898ddd4443b3
(hidden revision '898ddd4443b3' was rewritten as: befae6138569)
......
......@@ -128,7 +128,7 @@ rebase (parents change)
$ mkcommit C0
$ mkcommit D0
$ hg rebase -r . -d 'desc(B0)'
rebasing 10:c85eff83a034 "D0" (tip)
rebasing 10:c85eff83a034 tip "D0"
check result
......
......@@ -29,7 +29,7 @@ Let's go back to amend 0 and make an orphan out of 1
Now rebase the successor of 0 on top of 1
$ hg rebase -r . -d 1
rebasing 2:32acf8fb1b23 "apricot and coconut" (tip)
rebasing 2:32acf8fb1b23 tip "apricot and coconut"
1 new orphan changesets
Pruning 1 just to get it out of the way
......
......@@ -177,7 +177,7 @@ When the successors does not form a linear chain and are multiple heads
() draft
$ hg rebase -r . -d 8fa14d15e168
rebasing 9:c0fbf8aaf6c4 "added a b c" (tip)
rebasing 9:c0fbf8aaf6c4 tip "added a b c"
$ hg glog
@ 10:7f87764e5b64 added a b c
| () draft
......
......@@ -578,7 +578,7 @@ then pull from public repo creating phase divergence
$ cd ../alice
$ hg rebase -r . -d .^^^
rebasing 9:2352021b3785 "added x to x" (bm tip)
rebasing 9:2352021b3785 bm tip "added x to x"
$ hg pull ../public
pulling from ../public
......@@ -707,7 +707,7 @@ Alice is tired of pushing and pulling and will create phase-divergence locally
$ hg add y
$ hg ci -m "y to y and foobar to foo"
$ hg rebase -r . -d .^^^
rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo"
$ echo foo > y
$ hg amend
......@@ -814,7 +814,7 @@ conflicts while rebasing on parent
$ echo l > l
$ hg ci -Aqm "added l to l"
$ hg rebase -r . -d .^^^^
rebasing 17:f3794e5a91dc "added l to l" (tip)
rebasing 17:f3794e5a91dc tip "added l to l"
$ echo kl > l
$ echo foo > x
$ hg add x
......
......@@ -507,7 +507,7 @@ Initial setup
$ node=`hg log --rev 'desc("c_E")' -T '{node}'`
$ hg rebase -s $node -d 'desc("c_B")'
rebasing 5:4ab2719bbab9 "c_E"
rebasing 6:77ccbf8d837e "c_F" (tip)
rebasing 6:77ccbf8d837e tip "c_F"
$ hg phase --public tip
$ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
rebasing 5:4ab2719bbab9 "c_E"
......
......@@ -338,9 +338,9 @@ When the current topic and successors topic are same, but obsolete cset has
different topic
$ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
rebasing 16:d2dc89c57700 "add iii" (bar)
rebasing 16:d2dc89c57700 bar "add iii"
1 new orphan changesets
rebasing 17:9bf430c106b7 "add jjj" (bar)
rebasing 17:9bf430c106b7 bar "add jjj"
1 new orphan changesets
$ hg log -Gr 42b49017ff90::
* 21 - {bar} 7542e76aba2c add jjj (draft)
......
......@@ -379,7 +379,7 @@ her change, so now she can publish it.
Alice rebases her draft changeset on top of Bob's public changeset and
publishes the result.
$ hg rebase -d 4
rebasing 3:3363442626b3 "fix bug 15 (v2)" (bug15)
rebasing 3:3363442626b3 bug15 "fix bug 15 (v2)"
$ hg push ../public
pushing to ../public
searching for changes
......
......@@ -182,13 +182,13 @@ Changing topic in between the stack
Added a ()
$ hg rebase -s 11 -d 22
rebasing 11:1315a3808ed0 "Added d" (foo)
rebasing 11:1315a3808ed0 foo "Added d"
switching to topic foo
rebasing 16:edc4a6b9ea60 "Added e" (bar)
rebasing 16:edc4a6b9ea60 bar "Added e"
switching to topic bar
rebasing 17:82e0b14f4d9e "Added f" (bar)
rebasing 18:e7b418d79a05 "Added g" (bar)
rebasing 20:c2d6b7df5dcf "Added h" (foobar)
rebasing 17:82e0b14f4d9e bar "Added f"
rebasing 18:e7b418d79a05 bar "Added g"
rebasing 20:c2d6b7df5dcf foobar "Added h"
switching to topic foobar
$ hg glog
......
......@@ -113,7 +113,7 @@ rebase on branch ngtip
switching to topic elephant
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase
rebasing 4:cb7ae72f4a80 "babar" (elephant)
rebasing 4:cb7ae72f4a80 elephant "babar"
switching to topic elephant
$ hg log -G
@ 7 (elephant) babar
......@@ -134,7 +134,7 @@ rebase on branch ngtip
switching to topic monkey
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg rebase
rebasing 5:d832ddc604ec "zephir" (monkey)
rebasing 5:d832ddc604ec monkey "zephir"
switching to topic monkey
$ hg log -G
@ 8 (monkey) zephir
......@@ -177,7 +177,7 @@ Rebase on other topic heads if any
o 0 () c_alpha
$ hg rebase
rebasing 9:d79a104e2902 "Huc" (tip monkey)
rebasing 9:d79a104e2902 tip monkey "Huc"
$ hg log -G
@ 10 (monkey) Huc
|
......@@ -229,7 +229,7 @@ merge destination
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" (elephant)
rebasing 7:8d0b77140b05 elephant "babar"
switching to topic elephant
$ hg up monkey
switching to topic monkey
......
......@@ -72,7 +72,7 @@ Rebase the commit
switching to topic myfeature
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase
rebasing 1:39e7a938055e "add feature1" (myfeature)
rebasing 1:39e7a938055e myfeature "add feature1"
switching to topic myfeature
$ hg stack
### topic: myfeature
......@@ -123,7 +123,7 @@ Rebase the topic
switching to topic myotherfeature
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
switching to topic myotherfeature
......@@ -137,7 +137,7 @@ Resolve the conflict
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
Check the the commit has the right topic
......
......@@ -160,7 +160,7 @@ Test case with divergence
1 new orphan changesets
2 new content-divergent changesets
$ hg rebase -r . -d ec94a1ed1330~1
rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
rebasing 9:eb3b16fef8ea tip foo "Added e and f"
$ hg stack
### topic: foo (2 heads)
### target: default (branch)
......
......@@ -410,8 +410,8 @@ Case with multiple heads on the topic
Make things linear again
$ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
rebasing 4:0f9ac936c87d "c_e" (foo)
rebasing 5:6559e6d93aea "c_f" (foo)
rebasing 4:0f9ac936c87d foo "c_e"
rebasing 5:6559e6d93aea foo "c_f"
$ hg log -G
o 8 default {foo} draft c_f
|
......@@ -480,8 +480,8 @@ We amend the message to make sure the display base pick the right changeset
$ hg commit --amend -m 'c_D'
4 new orphan changesets
$ hg rebase -d . -s 'desc(c_g)'
rebasing 9:81264ae8a36a "c_g" (foo)
rebasing 10:fde5f5941642 "c_h" (foo)
rebasing 9:81264ae8a36a foo "c_g"
rebasing 10:fde5f5941642 foo "c_h"
$ hg log -G
o 13 default {foo} draft c_h
|
......@@ -546,8 +546,8 @@ Complex cases where commits with same topic are not consecutive but are linear
Converting into a linear chain
$ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
rebasing 7:215bc359096a "c_e" (foo)
rebasing 8:ec9267b3f33f "c_f" (foo)
rebasing 7:215bc359096a foo "c_e"
rebasing 8:ec9267b3f33f foo "c_f"
$ hg log -G
o 15 default {foo} draft c_f
......@@ -593,17 +593,17 @@ Changing topics on some commits in between
o 0 default {} public c_a
$ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
rebasing 15:77082e55de88 "c_f" (foo)
rebasing 15:77082e55de88 foo "c_f"
switching to topic foo
1 new orphan changesets
switching to topic foobar
$ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
rebasing 12:0c3e8aed985d "c_g" (foo)
rebasing 12:0c3e8aed985d foo "c_g"
switching to topic foo
rebasing 13:b9e4f3709bc5 "c_h" (foo)
rebasing 16:4bc813530301 "c_e" (foobar)
rebasing 13:b9e4f3709bc5 foo "c_h"
rebasing 16:4bc813530301 foobar "c_e"
switching to topic foobar
rebasing 18:4406ea4be852 "c_f" (tip foo)
rebasing 18:4406ea4be852 tip foo "c_f"
switching to topic foo
switching to topic foobar
$ hg up
......@@ -902,12 +902,12 @@ Test stack behavior with a split
get things linear again
$ hg rebase -r s1 -d default
rebasing 16:1d84ec948370 "c_D" (tip blue)
rebasing 16:1d84ec948370 tip blue "c_D"
switching to topic blue
$ hg rebase -r s2 -d s1
rebasing 13:3ab2eedae500 "c_G" (blue)
rebasing 13:3ab2eedae500 blue "c_G"
$ hg rebase -r s3 -d s2
rebasing 8:3bfe800e0486 "c_I" (blue)
rebasing 8:3bfe800e0486 blue "c_I"
$ hg stack
### topic: blue
### target: default (branch)
......
......@@ -488,10 +488,10 @@ But the topic will see that branch head as a valid destination:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
rebasing 1:13900241408b "adding condiments" (food)
rebasing 1:13900241408b food "adding condiments"
merging shopping
switching to topic food
rebasing 2:287de11b401f "adding fruits" (food)
rebasing 2:287de11b401f food "adding fruits"
merging shopping
$ hg log --graph
......@@ -1055,12 +1055,12 @@ changeset on top of the latest:
#endif
$ hg rebase
rebasing 6:183984ef46d1 "Adding hammer" (tools)
rebasing 6:183984ef46d1 tools "Adding hammer"
merging shopping
switching to topic tools
rebasing 7:cffff85af537 "Adding saw" (tools)
rebasing 7:cffff85af537 tools "Adding saw"
merging shopping
rebasing 8:34255b455dac "Adding drill" (tools)
rebasing 8:34255b455dac tools "Adding drill"
merging shopping
But what about the other topic? You can use 'hg topics --verbose' to see
......@@ -1087,10 +1087,10 @@ them to the default branch, and then mercurial would complain about the
multiple *public* heads it would create on that branch:
$ hg rebase -b drinks
rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
rebasing 9:8dfa45bd5e0c drinks "Adding apple juice"
merging shopping
switching to topic drinks
rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
rebasing 10:70dfa201ed73 drinks "Adding orange juice"
merging shopping
switching to topic tools
......@@ -1777,9 +1777,9 @@ completely linear history so it's what we will do.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
rebasing 19:d5c51ee5762a "Adding saw" (tools)
rebasing 19:d5c51ee5762a tools "Adding saw"
merging shopping
rebasing 20:bae3758e46bf "Adding drill" (tools)
rebasing 20:bae3758e46bf tools "Adding drill"
merging shopping
$ hg stack
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment