From: Enrico Weigelt <enrico.weigelt@vnc.biz>
To: Josef Wolf <jw@raven.inka.de>
Cc: git@vger.kernel.org
Subject: Re: Workflow for templates?
Date: Sat, 27 Oct 2012 20:45:45 +0200 (CEST) [thread overview]
Message-ID: <3190de06-2eaf-4a39-91aa-9cc34c20fc8e@zcs> (raw)
In-Reply-To: <20121025211522.GA28437@raven.wolf.lan>
Hi,
<snip>
I'd suggest a 3 level branch hierachy (IOW: the lower level
is rebased ontop of the next higher level):
* #0: upstream branch
* #1: generic local maintenance branch
* #2: per-instance cutomization branches
Normal additions go to the lowest level #2. When you've got
some generic commit, you propagate it to the next level
(cherry-pick) and rebase layer #2 ontop of it.
Now you can send your layer #1 to upstream for integration.
When upstream updated his branch, you simply rebase #1
ontop of it, do your checks etc, then proceed to rebasing #3.
You could also introduce more intermediate layers (eg when you've
got different groups of similar instance that share certain changes)
cu
--
Mit freundlichen Grüßen / Kind regards
Enrico Weigelt
VNC - Virtual Network Consult GmbH
Head Of Development
Pariser Platz 4a, D-10117 Berlin
Tel.: +49 (30) 3464615-20
Fax: +49 (30) 3464615-59
enrico.weigelt@vnc.biz; www.vnc.de
next prev parent reply other threads:[~2012-10-27 18:46 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 [this message]
2012-10-31 10:44 ` Josef Wolf
2012-11-06 19:50 ` Josef Wolf
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=3190de06-2eaf-4a39-91aa-9cc34c20fc8e@zcs \
--to=enrico.weigelt@vnc.biz \
--cc=git@vger.kernel.org \
--cc=jw@raven.inka.de \
/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).