From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: Recording cherry-picked commits Date: Sun, 23 Mar 2008 13:11:59 +0100 (CET) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Rafael Garcia-Suarez , git@vger.kernel.org To: Jean-Baptiste Quenot X-From: git-owner@vger.kernel.org Sun Mar 23 13:12:50 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JdP48-0001da-OG for gcvg-git-2@gmane.org; Sun, 23 Mar 2008 13:12:45 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759267AbYCWMMD (ORCPT ); Sun, 23 Mar 2008 08:12:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759241AbYCWMMB (ORCPT ); Sun, 23 Mar 2008 08:12:01 -0400 Received: from mail.gmx.net ([213.165.64.20]:51254 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1759177AbYCWMMA (ORCPT ); Sun, 23 Mar 2008 08:12:00 -0400 Received: (qmail invoked by alias); 23 Mar 2008 12:11:58 -0000 Received: from host86-148-26-43.range86-148.btcentralplus.com (EHLO racer.home) [86.148.26.43] by mail.gmx.net (mp021) with SMTP; 23 Mar 2008 13:11:58 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX19SejBixRZSRieg+xhbYG/6ffs2qfYa97YqpXr4Zk QyOK1tUqIMAqxm X-X-Sender: gene099@racer.site In-Reply-To: User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Sun, 23 Mar 2008, Jean-Baptiste Quenot wrote: > 2008/3/22, Rafael Garcia-Suarez : > > On 22/03/2008, Jean-Baptiste Quenot 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) > > Yes that's what I meant. Usually I'm always at the root when I'm > cherry-picking changes but you're right the script could be improved in > this regard. Is there a trick to find the root repository directory? Actually, you should not store it in the root of the working tree, but in the git dir (because it should never be tracked!), and then you can make it non-hidden: file="$(git rev-parse --git-dir)"/cherry > > What happens to .gitcherry across merges ? I think your solution > > isn't robust enough. > > The .gitcherry is merged like any other file. I'm just trying to > mimic svnmerge here, not to reinvent anything. As Git does not have > file metadata, I'm using a plain text file to achieve this. Ah, I see, so you _want_ to track it. I do not like this idea personally, but then, I will not use .gitcherry anyway. file="$(git rev-parse --show-cdup)"/.gitcherry Hth, Dscho