Push creates new heads without -f

[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?

-- 
Kind regards,
  Henrik Stuart
________________________________________
Fra: Colin Caughie [c.caughie at indigovision.com]
Sendt: 1. september 2009 08:02
Til: Matt Mackall; Dirkjan Ochtman
Cc: mercurial at selenic.com; Henrik Stuart
Emne: RE: Push creates new heads without -f

I've upgraded our server to 1.3.1, I'll report back when I know whether or not it's fixed the problem. I guess either way we learn something about it.

Colin

> -----Original Message-----
> From: Matt Mackall [mailto:mpm at selenic.com]
> Sent: 31 August 2009 23:45
> To: Dirkjan Ochtman
> Cc: Colin Caughie; mercurial at selenic.com; Henrik Stuart
> Subject: Re: Push creates new heads without -f
>
> On Mon, 2009-08-31 at 11:28 +0200, Dirkjan Ochtman wrote:
> > On Mon, Aug 31, 2009 at 11:24, Colin
> Caughie<c.caughie at indigovision.com> wrote:
> > > We're using Mercurial 1.3.1. Although now that I think of it our
> server is
> > > still on 1.2.1, not sure if that could be the problem.
> > >
> > > Has anyone else experienced this? Is there a workaround?
> >
> > I think we have some bugs there that might have been fixed in
> > 1.3/1.3.1 (on the server side), yes.
>
> Well, no, actually, this isn't at all expected. We should have the
> old
> behavior if the server doesn't support the new protocol. That was a
> requirement for accepting the new code. Adding Henrik.