git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Jed Brown <jed@59a2.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Jeff King <peff@peff.net>, Max Horn <max@quendi.de>
Subject: Re: [PATCH v2 11/13] remote-hg: force remote push
Date: Thu, 4 Apr 2013 13:13:10 -0600	[thread overview]
Message-ID: <CAMP44s1b_SWkVXe2Vyzs2yj1M9Z-2KcCXbp9LCJ_oWxuC+2pAg@mail.gmail.com> (raw)
In-Reply-To: <87y5cyqhya.fsf@59A2.org>

On Thu, Apr 4, 2013 at 12:17 PM, Jed Brown <jed@59a2.org> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>> Ideally we shouldn't do this, as it's not recommended in mercurial
>> documentation, but there's no other way to push multiple bookmarks (on
>> the same branch), which would be the behavior most similar to git.
>
> The problem is that you're interacting with a Mercurial upstream, not a
> Git upstream.  When you're in their playground, you have to play by
> their rules.  Creating new heads is disruptive and not likely to be
> appreciated.

If that's the case, they should disable in the server, just like some
people disable non-fast-forward pushes in git.

The problem is Mercurial, purely and simple, without forcing the push,
how do you expect this to work?

% git clone hg::whatever
% git checkout -b feature-a master
# do stuff
% git push -u origin feature-a

If somebody made a single commit to master (default), you can't push
any more, you have to merge master to feature-a, and if you push
further changes to feature-a and somebody is blocked by that, they
need to merge feature-a to master. It's a completely nonsensical
workflow, and there's nothing _we_ can do about it.

However, it's easy to work around; simply create a 'bookmarks' branch
were people can push unlimited amounts of heads, problem solved. The
people working with traditional permanent branches won't be blocked by
other people pushing bookmarks in a git-like workflow.

Why punish the sane people?

However we can have a configuration to turn this on and off, I would
all it remote-hg.stop-me-from-doing-what-i-just-told-you-to-do. I
don't see the hurry though, specially if (according to you), remote-hg
can't even clone.

Cheers.

-- 
Felipe Contreras

  reply	other threads:[~2013-04-04 19:13 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04 15:30 [PATCH v2 00/13] remote-hg: general updates Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 01/13] remote-hg: trivial cleanups Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 02/13] remote-hg: add missing config variable in doc Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 03/13] remote-hg: properly report errors on bookmark pushes Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 04/13] remote-hg: fix for files with spaces Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 05/13] remote-hg: make sure fake bookmarks are updated Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 06/13] remote-hg: trivial test cleanups Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 07/13] remote-hg: redirect buggy mercurial output Felipe Contreras
2013-04-04 16:40   ` Junio C Hamano
2013-04-04 15:30 ` [PATCH v2 08/13] remote-hg: split bookmark handling Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 09/13] remote-hg: refactor export Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 10/13] remote-hg: update remote bookmarks Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 11/13] remote-hg: force remote push Felipe Contreras
2013-04-04 16:44   ` Junio C Hamano
2013-04-04 18:56     ` Felipe Contreras
2013-04-04 19:06       ` Junio C Hamano
2013-04-04 18:17   ` Jed Brown
2013-04-04 19:13     ` Felipe Contreras [this message]
2013-04-04 20:14       ` Jed Brown
2013-04-04 20:35         ` Felipe Contreras
2013-04-04 20:48           ` Jed Brown
2013-04-04 21:34             ` Felipe Contreras
2013-04-04 22:27               ` Jed Brown
2013-04-04 23:06                 ` Felipe Contreras
2013-04-05  6:31                 ` Joachim Schmitz
2013-04-05 12:16                   ` Jed Brown
2013-04-04 15:30 ` [PATCH v2 12/13] remote-hg: update tags globally Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 13/13] remote-hg: push to the appropriate branch Felipe Contreras
2013-04-04 16:50   ` Junio C Hamano
2013-04-05  9:16     ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMP44s1b_SWkVXe2Vyzs2yj1M9Z-2KcCXbp9LCJ_oWxuC+2pAg@mail.gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jed@59a2.org \
    --cc=max@quendi.de \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).