Mercurial > hg
comparison tests/test-rebase-pull.t @ 28189:fac3a24be50e
rebase: choose default destination the same way as 'hg merge' (BC)
This changeset finally make 'hg rebase' choose its default destination using the
same logic as 'hg merge'. The previous default was "tipmost changeset on the
current branch", the new default is "the other head if there is only one". This
change has multiple consequences:
- Multiple tests which were not rebasing anything (rebasing from tipmost head)
are now rebasing on the other "lower" branch. This is the expected new
behavior.
- A test is now explicitly aborting when there is too many heads on the branch.
This is the expected behavior.
- We gained a better detection of the "nothing to rebase" case while performing
'hg pull --rebase' so the message have been updated. Making clearer than an
update was performed and why. This is beneficial side-effect.
- Rebasing from an active bookmark will behave the same as 'hg merge' from a
bookmark.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sun, 14 Feb 2016 13:25:59 +0000 |
parents | 0e3835c7e1cf |
children | d7af9b4ae7dd |
comparison
equal
deleted
inserted
replaced
28188:6411140aeda9 | 28189:fac3a24be50e |
---|---|
83 searching for changes | 83 searching for changes |
84 adding changesets | 84 adding changesets |
85 adding manifests | 85 adding manifests |
86 adding file changes | 86 adding file changes |
87 added 1 changesets with 1 changes to 1 files | 87 added 1 changesets with 1 changes to 1 files |
88 nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca | 88 nothing to rebase - updating instead |
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90 updating bookmark norebase | 90 updating bookmark norebase |
91 | 91 |
92 $ hg tglog -l 1 | 92 $ hg tglog -l 1 |
93 @ 2: 'R1' | 93 @ 2: 'R1' |
283 searching for changes | 283 searching for changes |
284 adding changesets | 284 adding changesets |
285 adding manifests | 285 adding manifests |
286 adding file changes | 286 adding file changes |
287 added 1 changesets with 1 changes to 1 files (+1 heads) | 287 added 1 changesets with 1 changes to 1 files (+1 heads) |
288 nothing to rebase - working directory parent is already an ancestor of destination 65bc164c1d9b | 288 nothing to rebase - updating instead |
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
290 1 other heads for branch "default" | 290 1 other heads for branch "default" |
291 $ hg tglog | 291 $ hg tglog |
292 @ 9: 'R6' | 292 @ 9: 'R6' |
293 | | 293 | |