[PATCH 09 of 10] rebase: use other branch head as default destination instead of branch head (bc)
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Jan 17 23:37:04 UTC 2014
On 01/13/2014 06:03 AM, Mads Kiilerich wrote:
> Thanks for the comments. I will take a closer look. One quick comment:
>
> On 01/13/2014 09:20 AM, Pierre-Yves David wrote:
>>> Other confusion came from how closed branch heads often didn't count
>>> as other
>>> branch head.
>> I feel that reasonable. Excluding closed branch from common operation
>> sound the
>> way to go. I think hgview is even filtering them out by default.
>
> I would argue for moving in the opposite direction.
`hg merge` refuses to takes closed heads as implicit target. I strongly
argue for rebase to go in the same direction than merge.
On a general basis we should make closed heads more powerful, not less
powerful.
>
> The main or initial motivation for this series was this:
>
> $ hg pull --rebase # gets a changeset closing the current branch
> nothing to rebase # ignoring the closed branch head
> $ hg push
> abort: push creates new remote head ...
> $ hg rebase
> nothing to rebase
>
> But just getting more helpful error messages would we a step forward.
+1 for improving error message in that case (note that merge is probably
affected too)
--
Pierre-Yves
More information about the Mercurial-devel
mailing list