Updating rebase help

Kevin Bullock kbullock+mercurial at ringworld.org
Thu Jan 31 13:02:15 CST 2013


On Jan 31, 2013, at 12:48 PM, Greg Ward wrote:

> On 30 January 2013, Pierre-Yves David said:
> 
>>> One result of the rules for selecting the destination changeset
>>> and source branch is that, unlike ``merge``, rebase will do
>>> nothing if you are at the latest (tipmost) head of a named branch
>>> with two heads. You need to explicitly specify source and/or
>>> destination (or ``update`` to the other head, if it's the head of
>>> the intended source branch).
>> 
>> I find this paragraph confusing. Moving it in a verbose section in the --dest
>> parameters ?
> 
> I find rebase's behaviour confusing. ;-) The fact that it is
> inconsistent with merge is annoying and bites me about 50% of the
> times I use rebase. But hey, if you can find a clearer way to explain
> this, please do!

Perhaps the right way to handle this would be to print a hint if there's a less-tipmost head on the branch.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list