From: Junio C Hamano <gitster@pobox•com>
To: Heiko Voigt <hvoigt@hvoigt•net>
Cc: Martin Langhoff <martin.langhoff@gmail•com>,
Jens Lehmann <Jens.Lehmann@web•de>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: Publishing "filtered branch repositories" - workflow / recommendations?
Date: Mon, 09 Dec 2013 15:56:29 -0800 [thread overview]
Message-ID: <xmqqhaahvas2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20131209225950.GG9606@sandbox-ub> (Heiko Voigt's message of "Mon, 9 Dec 2013 23:59:50 +0100")
Heiko Voigt <hvoigt@hvoigt•net> writes:
> On Fri, Dec 06, 2013 at 02:40:15PM -0500, Martin Langhoff wrote:
>> On Fri, Dec 6, 2013 at 3:48 AM, Jens Lehmann <Jens.Lehmann@web•de> wrote:
>> > Right you are, we need tutorials for the most prominent use cases.
>>
>> In the meantime, are there any hints? Emails on this list showing a
>> current "smart" workflow? Blog posts? Notes on a wiki?
>
> None that I know of mainly because we have not yet reached the goal we
> are aiming at. Maybe we should write something, A few points from
> $dayjob that come to my mind:
>
> * A submodule commit is only allowed to be merged into master in a
> superproject commit if it is merged into master (or a stable branch)
> in the submodule. That way you ensure that any submodules commits
> that are tracked in a superproject are contained in each other and
> can be cleanly merged. (no rewinds, one commit contains the other)
I think this is closely related to Martin's list of wishes we
earlier saw in the thread: remind the user to push necessary
submodule tip before the top-level commit that needs that commit in
the submodule is pushed out. Giving projects a way to implement
such a policy decision would be good, and having a default policy,
if we can find one that would be reasonable for any submodule users,
would be even better. Would adding a generic pre-push hook at the
top-level sufficient for that kind of thing, I have to wonder.
next prev parent reply other threads:[~2013-12-09 23:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 23:01 Publishing "filtered branch repositories" - workflow / recommendations? Martin Langhoff
2013-12-05 18:43 ` Martin Langhoff
2013-12-05 19:18 ` Jens Lehmann
2013-12-05 19:27 ` Martin Langhoff
2013-12-05 19:54 ` Jens Lehmann
2013-12-05 22:06 ` Martin Langhoff
2013-12-06 8:48 ` Jens Lehmann
2013-12-06 19:40 ` Martin Langhoff
2013-12-09 22:59 ` Heiko Voigt
2013-12-09 23:56 ` Junio C Hamano [this message]
2013-12-11 22:03 ` Jens Lehmann
2013-12-11 23:16 ` Junio C Hamano
2013-12-12 13:39 ` Heiko Voigt
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=xmqqhaahvas2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=martin.langhoff@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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