From: Josef Wolf <jw@raven.inka.de>
To: git@vger.kernel.org
Subject: Re: Workflow for templates?
Date: Tue, 6 Nov 2012 20:50:45 +0100 [thread overview]
Message-ID: <20121106195045.GD28437@raven.wolf.lan> (raw)
In-Reply-To: <20121031104403.GC28437@raven.wolf.lan>
No suggestions on this one?
On Wed, Oct 31, 2012 at 11:44:04AM +0100, Josef Wolf wrote:
> I am somewhat unsure whether it would work this way. After all, there seems to
> be an unbreakable rule with git: never rebase published branches.
>
> Thus, once I have published my work to other people who also need to work on
> the same localizations as I do, I have no longer the option of rebasing to get
> rid of the localizations and put the generic template stuff for upstream.
>
> I guess, my concern is because I have not yet fully understood the problems of
> rebasing, and how to recover from them.
>
> Maybe I should try to explain the problem in terms of repository
> hierarchy. Let's assume, there is this hierarchy of repositories:
>
> upstream: central repository, containing the generic template
>
> foo-site: repository for site foo. Here we have localizations for a specific
> administrative entity named foo (say, google).
> This is where clones for production are made from, and production
> boxes pull from here to be kept up-to-date.
>
> foo-prodA: A clone of foo-site, put in production and pulling from a specific
> branch on foo-site to receive released, blessed updates.
> foo-prodB: Similar to foo-prodA, but on another box.
>
> foo-devA: A clone of foo-site to make development, releases, and whatever for
> foo.
> foo-devB: One more clone of foo-site, Developer B is working here.
>
> Then, we might have more administrative entities: bar-site, bar-prodA,
> bar-prodB, bar-devA, bar-devB, for example. This might be Microsoft, for
> example.
>
> Further, foo-devA might be the same person as bar-devA.
>
> So when foo-devA pulls from foo-devB, then foo-devB will create problems when
> he rebases after that pull.
>
> I think I have some kind of misunderstanding here, but I just can't figure
> what it is.
>
>
> Maybe I should try to explain the problem in yet other words:
>
> What I am trying to achieve, is to extend the workflow from development to
> deployment across multiple administrative entities. As a picture:
>
> upstream (templates only).
> ^
> |
> v
> development (configured, might contain experimental changes)
> ^
> |
> v
> deployment (configured)
>
> This workflow should not stop at administrative borders. Just replace foo by
> google and bar by Microsoft to get an idea of what I am trying to achieve.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-11-06 20:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 21:15 Workflow for templates? Josef Wolf
2012-10-27 18:45 ` Enrico Weigelt
2012-10-31 10:44 ` Josef Wolf
2012-11-06 19:50 ` Josef Wolf [this message]
2012-11-06 20:21 ` Pyeron, Jason J CTR (US)
2012-11-06 21:07 ` Josef Wolf
2012-11-07 16:03 ` Holger Hellmuth (IKS)
2012-11-10 7:27 ` Enrico Weigelt
2012-11-10 7:13 ` Enrico Weigelt
2012-11-10 9:56 ` Philip Oakley
2012-11-10 10:29 ` Enrico Weigelt
2012-11-10 13:44 ` Philip Oakley
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121106195045.GD28437@raven.wolf.lan \
--to=jw@raven.inka.de \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).