From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Sat, 22 Mar 2008 22:48:32 GMT
Subject: Re: Recording cherry-picked commits
Message-ID: <b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@mail.gmail.com>
In-Reply-To: <ae63f8b50803220937k78571fbdl1eeb60966ec7aa40@mail.gmail.com>

On 22/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> What about using a hidden ".gitcherry" file in the current branch to
>  store the commits that have been applied?  With the simple shell
>  scripts below I'm able to achieve the same effect as svnmerge:

(.gitcherry should really be at the root of the git repository, not in
the current directory)

What happens to .gitcherry across merges ? I think your solution isn't
robust enough.

Here's an alternate idea: store the original sha1 in the commit
message, via a custom header (something like X-Cherry-Picked-From) at
least in case of conflict, and have git-cherry recognize it.

(I have the same problem as you, by the way, and would really like to
see it solved one way or another.)