From: Simon Thum <simon.thum@gmx.de>
To: nicholas.dokos@hp.com
Cc: Daniel Dehennin <daniel.dehennin@baby-gnu.org>, emacs-orgmode@gnu.org
Subject: Re: [DEV] New git workflow
Date: Sun, 01 Apr 2012 11:26:18 +0200 [thread overview]
Message-ID: <4F781F3A.1030507@gmx.de> (raw)
In-Reply-To: <32435.1332617387@alphaville>
Hi Nick,
I did not mean to imply git is not capable of working that way. It's
more a question of what is accepted practice and most importantly, what
fits the problem you actually have.
The difference between both approaches, it seems to me, shows when there
is a difference between the fix is it would have looked when done right
from the first day on, and the fix as it looks when introduced later.
Daggy fixes' mental image is to incrementally fix your release branches
(or how you call them) each the in way it needs to be fixed.
Cherry-picking usually implies (but does not mandate!) fix on master,
then go back. Git's support for the other way round could be better,
e.g. by introducing a DAGGY_FIX_HEAD and repo mode so you don't need to
alternate cherry-pick, tag, checkout, ...
To me the mental image behind is the main difference, and what is better
depends on the fix and the project and what not.
Just my 2c.
Cheers,
Simon
On 03/24/2012 08:29 PM, Nick Dokos wrote:
> Simon Thum<simon.thum@gmx.de> wrote:
>
>> Hi Daniel,
>>
>> On 03/24/2012 12:05 PM, Daniel Dehennin wrote:
>>> Simon Thum<simon.thum@gmx.de> writes:
>>> 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.
>>
>> I'm a bit biased as I mainly have git experience but to me it seems
>> that both cherry-picking and daggy fixes have their strengths and
>> weaknesses, and I'd rather have them both in all the VCSes but
>> needless fights over which one is ultimately superior. Git should
>> probably learn that thing, IMO.
>>
>
> I'm probably missing something but what's there to learn? You check out
> the offending commit, make a branch off of it, commit the fix on the
> branch, give it a tag (so you can find it easily later on) and then
> merge it back anywhere you want. AFAICT, that's all there is to
> daggy-fixes and git is perfectly capable of doing that - no?
>
> Nick
>
>>>
>>> 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
>>>
>>
>>
>
prev parent reply other threads:[~2012-04-01 9:26 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
2012-03-24 20:08 ` Simon Thum
2012-03-24 19:29 ` Nick Dokos
2012-04-01 9:26 ` Simon Thum [this message]
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=4F781F3A.1030507@gmx.de \
--to=simon.thum@gmx.de \
--cc=daniel.dehennin@baby-gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=nicholas.dokos@hp.com \
/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).