From: Enrico Weigelt <enrico.weigelt@vnc.biz>
To: "Holger Hellmuth (IKS)" <hellmuth@ira.uka.de>
Cc: Josef Wolf <jw@raven.inka.de>, git@vger.kernel.org
Subject: Re: Workflow for templates?
Date: Sat, 10 Nov 2012 08:27:10 +0100 (CET) [thread overview]
Message-ID: <f3537815-e1ea-4242-ac49-9d5a1e4f0511@zcs> (raw)
In-Reply-To: <509A863B.4090805@ira.uka.de>
> Let me ask a different question: What is wrong with cherry-picking
> downstream changes to your upstream branch? Without rebasing it to
> downstream.
Naah, dont rebase the upstream ontop of downstream - this doenst make
any sense (yeah, my devs sometimes doing exatly this wong ;-o).
Instead, as you just said, cherry-pick the good commits into your
upstream branch and rebase your downstreams ontop of that. (doesnt
make any difference if this is done by different people or in different
administrative domains).
> That might mean there is a rather useless merge downstream later on,
> but that's the price you pay for not doing the change in a development
> branch.
That's one of the things rebase is for: not having your history filled
up with merges at all, but always have your local cutomizations added
ontop of the current upstream.
By the way: I'm also using this hierachy for package maintenance to
different target distros:
upstream branch
|
|----> upstream release tag X.Y.Z
|
\ /
bugfix branch (maint-X-Y-Z) => general (eg. distro-agnostig) fixes go here
|
|-----> maintenance release tag X.Y.Z.A
|
\ /
dist branch (mydist-X-Y-Z) => distro-specific customizations (eg.
| packaging control files, etc) go here
|------> dist package release tags X.Y.Z.A-B
Usually I do quick hotfixes in the dist branch (and assigning new dist version number),
then copy the dist branch into some topic-branch, rebase into latest bugfix branch,
cherry-pick the interesting commit(s) into the bugfix branch. When I do a new bugfix
release (from by bugfix branch), I rebase the dist branch ontop the latest bugfix
release tag, fix dist-package version numbers and run the dist-specific build and
testing pipeline.
Here's some example for it: https://github.com/vnc-biz/redmine-core
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-11-10 7:31 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
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 [this message]
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=f3537815-e1ea-4242-ac49-9d5a1e4f0511@zcs \
--to=enrico.weigelt@vnc.biz \
--cc=git@vger.kernel.org \
--cc=hellmuth@ira.uka.de \
--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).