Mercurial > evolve
diff tests/test-tutorial.t @ 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 | be31c34bb341 |
| children | 8a06b32061ce |
line wrap: on
line diff
--- 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 .