Superfluous(?) "push -f" warning
fg at nuxeo.com
Tue Mar 25 19:05:58 CDT 2008
Kai Grossjohann wrote:
> Say I have a named branch "unstable" and the default branch is for the
> stable release. Say further that those developing on the unstable
> branch do "hg merge -r default" often.
> Then after they do "hg merge -r default" the default branch loses its
> head and this means that I can't push changes on the default branch
> without using "-f".
> But I think if a named branch is headless, then it is not wrong for
> pushing to add a head to this branch.
> What do people think?
Yes, exactly. After a merge of a "bugfix" branch into a "dev" branch,
the "bugfix" head disappears, and the next "bugfix" commit will recreate
a new head (of course) which will generate this spurious warning. As my
users are confronted with it every day, I'll try to fix it eventually if
no one else does.
Florent Guillaume, Director of R&D, Nuxeo
Open Source Enterprise Content Management (ECM)
http://www.nuxeo.com http://www.nuxeo.org +33 1 40 33 79 87
More information about the Mercurial