Mercurial > evolve
changeset 1188:0c879e986ce4
test: adapt to core change in graft and rebase
The ouput changed we have to adapt
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 14 Dec 2014 12:19:40 -0800 |
| parents | 253293df84a6 |
| children | a556fff7adcf |
| files | tests/test-evolve.t tests/test-obsolete.t tests/test-stabilize-conflict.t tests/test-stabilize-result.t tests/test-touch.t tests/test-tutorial.t |
| diffstat | 6 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-evolve.t Sun Dec 14 12:19:40 2014 -0800 @@ -496,9 +496,9 @@ o 0:8685c6d34325@default(draft) add 0 $ hg graft -r3 -O - grafting revision 3 + grafting 3:0e84df4912da "add 3" $ hg graft -r1 -o 2 - grafting revision 1 + grafting 1:73d38bb17fd7 "add 1" $ glog --hidden @ 6:acb28cd497b7@default(draft) add 1 | @@ -526,7 +526,7 @@ created new head $ hg up -qC 6 $ hg graft -O 7 - grafting revision 7 + grafting 7:a5bfd90a2f29 "conflict" (tip) merging 1 warning: conflicts during merge. merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark') @@ -539,7 +539,7 @@ $ hg resolve -m 1 (no more unresolved files) $ hg graft --continue -O - grafting revision 7 + grafting 7:a5bfd90a2f29 "conflict" (tip) $ glog --hidden @ 8:920e58bb443b@default(draft) conflict |
--- a/tests/test-obsolete.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-obsolete.t Sun Dec 14 12:19:40 2014 -0800 @@ -513,6 +513,8 @@ #excluded 'whole rebase set is extinct and ignored.' message not in core $ hg rebase -b '3' -d 4 --traceback + rebasing 3:0d3f46688ccc "add obsol_c" + rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) 2 new divergent changesets $ hg --hidden log -q -r 'successors(3)' 4:725c380fe99b
--- a/tests/test-stabilize-conflict.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-stabilize-conflict.t Sun Dec 14 12:19:40 2014 -0800 @@ -167,7 +167,7 @@ $ hg resolve --all -m (no more unresolved files) $ hg evolve --continue - grafting revision 5 + grafting 5:71c18f70c34f "babar count up to fifteen" $ hg resolve -l $ hg log -G @ changeset: 8:1836b91c6c1d
--- a/tests/test-stabilize-result.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-stabilize-result.t Sun Dec 14 12:19:40 2014 -0800 @@ -92,13 +92,13 @@ +a +newer a $ hg evolve --continue - grafting revision 5 + grafting 5:3655f0f50885 "newer a" abort: unresolved merge conflicts (see hg help resolve) [255] $ hg resolve -m a (no more unresolved files) $ hg evolve --continue - grafting revision 5 + grafting 5:3655f0f50885 "newer a" Stabilize latecomer with different parent ========================================= @@ -126,6 +126,7 @@ Get a successors of 8 on it $ hg grab 8 + rebasing 8:1cf0aacfd363 "newer a" ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) Add real change to the successors
--- a/tests/test-touch.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-touch.t Sun Dec 14 12:19:40 2014 -0800 @@ -104,6 +104,7 @@ 1 new unstable changesets $ hg rebase -s 11 -d 12 + rebasing 11:* "move" (glob) $ hg st -C --change=tip A gna2 gna1
--- a/tests/test-tutorial.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-tutorial.t Sun Dec 14 12:19:40 2014 -0800 @@ -243,7 +243,9 @@ $ hg diff $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 + rebasing 1:4d5dc8187023 "adding condiment" merging shopping + rebasing 4:9d0363b81950 "adding fruit" merging shopping @@ -348,6 +350,7 @@ $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent + rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G @@ -409,6 +412,7 @@ for simplicity sake we get the bathroom change in line again $ hg grab 10b8aeaa8cc8 + rebasing 9:10b8aeaa8cc8 "bathroom stuff" merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg phase --draft .