Disable backing out merges?

Angel Ezquerra angel.ezquerra at gmail.com
Fri Oct 7 06:39:36 CDT 2011


On Fri, Oct 7, 2011 at 1:05 PM, Dominik Psenner <dpsenner at gmail.com> wrote:
>>> Maybe what we need is not a way to fix a broken merge but a way to
>>> tell users and mercurial that they should not _use_ that broken merge?
>>
>>I suppose you could achieve this via closing the line of development
>>following the merge, and then add a hook which prevented adding new
>>changesets that derive from such a line. Unless, perhaps, such changesets
>>contain a magic string - "reopens X" or something similar. You'd probably
>>want to add a bit of bookkeeping to prevent it from being slow, so it might
>>make better sense as an extension.
>
> Maybe there should be some kind of branch flag like "broken" that is alike
> "closed". hg could disallow to commit a new changeset if one of it's parents
> would be marked as "broken". In a way it is just stronger than "closed", but
> behaves similar.

That could make sense!

BTW, can someone explain what is the meaning and the point of "closing
a branch"?

As far a I can tell closing a branch doesn't do much... Closed
branches still count in the head count, which is quite counter
intuitive to me...

If all heads of a given branch are closed then the corresponding
branch is hidden when calling hg branch, right? Is that the whole
point of closing a branch?

Angel


More information about the Mercurial-devel mailing list