git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Workflow for templates?

From
Enrico Weigelt <enrico.weigelt@vnc.biz>
Date
Oct 27, 2012, 18:45 UTC
Message-ID
<3190de06-2eaf-4a39-91aa-9cc34c20fc8e@zcs>
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
Previous: Josef WolfNext: Josef Wolf
Message 2 of 12 in “Workflow for templates?”
  1. Josef WolfOct 25, 2012
  2. Enrico WeigeltOct 27, 2012
  3. Josef WolfOct 31, 2012
  4. Josef WolfNov 6, 2012
  5. Pyeron, Jason J CTR (US)Nov 6, 2012
  6. Josef WolfNov 6, 2012
  7. Holger Hellmuth (IKS)Nov 7, 2012
  8. Enrico WeigeltNov 10, 2012
  9. Enrico WeigeltNov 10, 2012
  10. Philip OakleyNov 10, 2012
  11. Enrico WeigeltNov 10, 2012
  12. Philip OakleyNov 10, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.