From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Thum <simon.thum@gmx.de>
Subject: Re: [DEV] New git workflow
Date: Sat, 24 Mar 2012 21:08:13 +0100
Message-ID: <4F6E29AD.1040304@gmx.de>
References: <87mx7cf613.fsf@altern.org> <4F69063F.40600@gmx.de>
	<87fwcyqmwe.fsf@hati.baby-gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:53806)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1SBWM3-0005jN-7O
	for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 15:10:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1SBWM1-0007Mj-A2
	for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 15:10:22 -0400
Received: from mailout-de.gmx.net ([213.165.64.22]:48200)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <simon.thum@gmx.de>) id 1SBWM0-0007Mf-W9
	for emacs-orgmode@gnu.org; Sat, 24 Mar 2012 15:10:21 -0400
In-Reply-To: <87fwcyqmwe.fsf@hati.baby-gnu.org>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Daniel Dehennin <daniel.dehennin@baby-gnu.org>
Cc: emacs-orgmode@gnu.org

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.

Cheers,

Simon

>
> 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
>