From: Daniel Dehennin <daniel.dehennin@baby-gnu.org>
To: emacs-orgmode@gnu.org
Subject: Re: [DEV] New git workflow
Date: Sat, 24 Mar 2012 12:05:53 +0100 [thread overview]
Message-ID: <87fwcyqmwe.fsf@hati.baby-gnu.org> (raw)
In-Reply-To: <4F69063F.40600@gmx.de> (Simon Thum's message of "Tue, 20 Mar 2012 23:35:43 +0100")
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Simon Thum <simon.thum@gmx.de> writes:
> Hi all,
Hello,
[...]
> Many projects use the IMO more sane model of release branches (or
> maintenance branches, if you prefer) for major releases. Minor ones
> are tagged on those branches, and back-porting critical fixes is much
> cleaner: Fixes and development go to master, fixes which should be
> back-ported are cherry-picked onto the release branches. When desired,
> a new release is tagged. Releases only come from release branches, of
> course.
It seems that one problem with cherry-picking is the tracking of what is
in which branch and from where it comes.
I'm not a git neither DVCS guru, but daggyfixes[1][2][3] is saner than
cherry-picking.
My 2¢.
Regards.
Footnotes:
[1] http://mercurial.selenic.com/wiki/DaggyFixes
[2] http://wiki.monotone.ca/DaggyFixes/
[3] http://stackoverflow.com/questions/2922652/git-is-there-a-way-to-figure-out-where-a-commit-was-cherry-picked-from
--
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2012-03-24 11:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 0:51 [DEV] New git workflow Bastien
2012-03-20 7:03 ` Achim Gratz
2012-03-20 7:24 ` Achim Gratz
2012-03-20 10:40 ` Bastien
2012-03-20 19:20 ` Achim Gratz
2012-03-21 0:02 ` Bastien
2012-03-21 0:23 ` Bastien
2012-03-20 10:47 ` Bastien
2012-03-20 22:35 ` Simon Thum
2012-03-20 22:27 ` Achim Gratz
2012-03-21 8:46 ` Simon Thum
2012-03-21 9:01 ` Achim Gratz
2012-03-21 22:38 ` Simon Thum
2012-03-24 11:05 ` Daniel Dehennin [this message]
2012-03-24 20:08 ` Simon Thum
2012-03-24 19:29 ` Nick Dokos
2012-04-01 9:26 ` Simon Thum
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: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fwcyqmwe.fsf@hati.baby-gnu.org \
--to=daniel.dehennin@baby-gnu.org \
--cc=emacs-orgmode@gnu.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://git.savannah.gnu.org/cgit/emacs/org-mode.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).