From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: unexpected git-cherry-pick conflict Date: Mon, 25 Jun 2007 08:55:21 +0100 (BST) Message-ID: References: <20070405071615.2915.6837.reportbug@acer> <20070607074357.27760.qmail@69aef7b888effd.315fe32.mid.smarden.org> <6b8a91420706070252y3fd581a3w427d91e5b982d29d@mail.gmail.com> <20070613091624.26463.qmail@353090644b4917.315fe32.mid.smarden.org> <20070613134336.13661.qmail@c61f4fed932273.315fe32.mid.smarden.org> <20070625071819.8091.qmail@5e4088a43a10fd.315fe32.mid.smarden.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org To: Gerrit Pape X-From: git-owner@vger.kernel.org Mon Jun 25 09:55:31 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1I2jQ1-0005h9-Di for gcvg-git@gmane.org; Mon, 25 Jun 2007 09:55:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751122AbXFYHz2 (ORCPT ); Mon, 25 Jun 2007 03:55:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751126AbXFYHz2 (ORCPT ); Mon, 25 Jun 2007 03:55:28 -0400 Received: from mail.gmx.net ([213.165.64.20]:51617 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750956AbXFYHz1 (ORCPT ); Mon, 25 Jun 2007 03:55:27 -0400 Received: (qmail invoked by alias); 25 Jun 2007 07:55:26 -0000 Received: from wbgn013.biozentrum.uni-wuerzburg.de (EHLO localhost) [132.187.25.13] by mail.gmx.net (mp048) with SMTP; 25 Jun 2007 09:55:26 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX182WZR/JZw2McRziw1dCOjujjPRo58yYU/IyMpE7a LPTvQTpdED7LPN X-X-Sender: gene099@racer.site In-Reply-To: <20070625071819.8091.qmail@5e4088a43a10fd.315fe32.mid.smarden.org> X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Mon, 25 Jun 2007, Gerrit Pape wrote: > On Wed, Jun 13, 2007 at 03:43:48PM +0100, Johannes Schindelin wrote: > > On Wed, 13 Jun 2007, Gerrit Pape wrote: > > > On Wed, Jun 13, 2007 at 01:58:51PM +0100, Johannes Schindelin wrote: > > > > On Wed, 13 Jun 2007, Gerrit Pape wrote: > > > > > $ git checkout master > > > > > Switched to branch "master" > > > > > $ git cherry-pick 8ddc4d5 > > > > > CONFLICT (file/directory): There is a directory with name link in > > > > > 8ddc4d5... file. Added link as link~HEAD > > > > > > > > Here you _still_ have the file in master. So that conflict is really > > > > expected, since a cherry-pick will only do a three-way merge. > > > > > > git-cherry-pick(1) states > > > Given one existing commit, apply the change the patch introduces, and > > > record a new commit that records it. This requires your working tree to > > > be clean (no modifications from the HEAD commit). > > > > > > The patch introduced by the commit that's cherry-pick'ed has nothing to > > > do with the link or new directory, it just changes 'file' > > > > > > $ git show 8ddc4d5 > > > commit 8ddc4d59444a362261e10a3b22324818f5dd2fa7 > > > Author: Gerrit Pape > > > Date: Wed Jun 13 09:10:30 2007 +0000 > > > > > > file > > > > > > diff --git a/file b/file > > > index 257cc56..3bd1f0e 100644 > > > --- a/file > > > +++ b/file > > > @@ -1 +1,2 @@ > > > foo > > > +bar > > > $ > > > > > > The patch applies to master just fine. Where's my thinking wrong? > > > > Hmm. Indeed. Thanks for clearing that up. Will work on it later. > > Hi, did you get to this yet?, not to stress you, just to make sure we > don't forget about it. I did not have time yet. Thanks for the reminder. Just for the record, if you send a reply to my message to the list, but without Cc: to me, I am very likely to miss it. Just by chance I did not, this time. Ciao, Dscho