Push creates new heads without -f

Kastner Masilko, Friedrich Kastner_Masilko at FESTO.AT
Tue Sep 1 10:57:28 CDT 2009


From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Henrik Stuart
> We've just made sure that inactive branch heads (on named branches) are push-able
> (i.e. dev merged into stable does not mean that there should be --force used for
> pushing a new dev changeset).
>
> There should be no situation where multiple heads show up without --force that I
> am aware of, and we certainly haven't seen anything while having > either 1.3(.1)
> -ish on the client side and 1.2.1-ish on the server side, nor with 1.3.1-ish in
> both places (we track various updates in hg and hg-stable in addition to the
> official release, but nothing that should influence pushing).
>
> Are you absolutely positive that no one is using --force inadvertently?

As mentioned on this list earlier (starting with
http://www.selenic.com/pipermail/mercurial/2009-July/026719.html ), we have the
same problem at work. I can absolutely confirm this behaviour, since I've experienced
it myself. --force was never used.

It's interesting that it only comes up with an old repository, newly created ones
don't have the problem.

Unfortunately, I can't make head or tail of the python debugger, otherwise I would
have tried to fix it on my own. I'm sure the problem is somewhere inside the branch-
resolving code inside the prepush() function in the localrepository class in
mercurial/localrepo.

The server was updated to 1.3, but the behaviour is still there.

regards,
Fritz


Development Software Systems
Festo Gesellschaft m.b.H.
Linzer Strasse 227
A - 1140 Wien

Firmenbuch Wien
FN 38435y

Tel: +43(1)91075-198
Fax: +43(1)91075-282
www.festo.at

Der Inhalt dieses E-Mails ist ausschliesslich fuer den bezeichneten Adressaten bestimmt. Jede Form der Kenntnisnahme, Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieses E-Mails durch unberechtigte Dritte ist unzulaessig. Wir bitten Sie, sich mit dem Absender des E-Mails in Verbindung zu setzen, falls Sie nicht der Adressat dieses E-Mails sind und das Material von Ihrem Computer zu loeschen. 

This e-mail and any attachments are confidential and intended solely for the addressee. The perusal, publication, copying or dissemination of the contents of this e-mail by unauthorised third parties is prohibited. If you are not the intended recipient of this e-mail, please delete it and immediately notify the sender.  



More information about the Mercurial mailing list