Mercurial > hg
comparison tests/test-rebase-bookmarks.t @ 28101:79437fb352ce
tests: add an explicit destination in some rebase tests
As we will make 'rebase' behave more like 'merge', it will no longer pick
'max(branch(.))' as the default destination. We have to hard code the expected
destination is multiple tests where it matters. After a careful inspection none
of theses tests really cares about the default destination behavior and just
omitted one out of laziness.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 08 Feb 2016 14:03:45 +0100 |
| parents | 157675d0f600 |
| children | 3b7cb3d17137 |
comparison
equal
deleted
inserted
replaced
| 28100:ab382192337a | 28101:79437fb352ce |
|---|---|
| 165 $ hg add c | 165 $ hg add c |
| 166 $ hg ci -m 'other C' | 166 $ hg ci -m 'other C' |
| 167 created new head | 167 created new head |
| 168 $ hg up 3 | 168 $ hg up 3 |
| 169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 170 $ hg rebase | 170 $ hg rebase --dest 4 |
| 171 rebasing 3:3d5fa227f4b5 "C" (Y Z) | 171 rebasing 3:3d5fa227f4b5 "C" (Y Z) |
| 172 merging c | 172 merging c |
| 173 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 173 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 174 unresolved conflicts (see hg resolve, then hg rebase --continue) | 174 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 175 [1] | 175 [1] |