Problems with hg push over SSH

[Paul Sargent]

On 8/28/07, Benoit Boissinot <bboissin at gmail.com> wrote:
>
> On 8/28/07, Imbeault, Jean-Christian <jeanchristian.imbeault at lehman.com>
> wrote:
> >
> > I'm new to mercurial and I'm having some problems with hg push using
> > SSH.
> >
> > I've setup a shared repository that I'm pulling from using hg pull
> > ssh://...
> >
> > I've just finished a chunk of work checked it into my local copy of the
> > repository. Now I want to push it back to the central repo but I'm
> > getting this error (?):
> >
> > $ hg push
> > ssh://aseqdsu@tklxecdev001//home/aseqdsu/mercurial/repository/OES
> > aseqdsu at tklxecdev001's password:
> > pushing to
> > ssh://aseqdsu@tklxecdev001//home/aseqdsu/mercurial/repository/OES
> > searching for changes
> > abort: push creates new remote branches!
> > (did you forget to merge? use push -f to force)
> >
> > For some reason using -f just doesn't sound right ...
> >
>
> You somehow created a new head, merge it before pushing
>
> see http://www.selenic.com/mercurial/wiki/index.cgi/Understandin
> gMercurial#head-75349837835f08689995a0777011390ee5dfd90d
>

I think a reason that this comes up is that often people are replacing
centralised systems. Mercurial can do this, but the examples are written
with developers 'pulling' from each other, rather than all 'pushing' back to
a central (unmanned) repository. It's subtly different and I've yet to see
an example for it that shows the normal workflow.

I think it's quite common to end up in some kind of hybrid flow.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20070828/2c4ad4e0/attachment.htm