From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: Re: Wrong conflicts on file splits Date: Mon, 04 May 2009 15:49:14 +0200 Message-ID: <49FEF25A.3090305@drmicha.warpmail.net> References: <9e4733910905040553u377ab11n1609d980021be498@mail.gmail.com> <49FEED2C.8010501@drmicha.warpmail.net> <9e4733910905040642h5932e80ds5c467db90e03f40d@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Git Mailing List To: Jon Smirl X-From: git-owner@vger.kernel.org Mon May 04 15:49:49 2009 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 1M0yYD-0000E4-Ex for gcvg-git-2@gmane.org; Mon, 04 May 2009 15:49:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831AbZEDNtW (ORCPT ); Mon, 4 May 2009 09:49:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755954AbZEDNtW (ORCPT ); Mon, 4 May 2009 09:49:22 -0400 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:58435 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755645AbZEDNtV (ORCPT ); Mon, 4 May 2009 09:49:21 -0400 Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id CFBAB3393FF; Mon, 4 May 2009 09:49:21 -0400 (EDT) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Mon, 04 May 2009 09:49:21 -0400 X-Sasl-enc: fSRcgd8ze33lFrBIYZXltVhcyHQL3EUs7Qvq91Ap+LYO 1241444961 Received: from localhost.localdomain (whitehead.math.tu-clausthal.de [139.174.44.12]) by mail.messagingengine.com (Postfix) with ESMTPSA id 3DE5F47572; Mon, 4 May 2009 09:49:21 -0400 (EDT) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b5pre) Gecko/20090504 Lightning/1.0pre Shredder/3.0b3pre In-Reply-To: <9e4733910905040642h5932e80ds5c467db90e03f40d@mail.gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Jon Smirl venit, vidit, dixit 04.05.2009 15:42: > On Mon, May 4, 2009 at 9:27 AM, Michael J Gruber > wrote: >> Jon Smirl venit, vidit, dixit 04.05.2009 14:53: >>> I keep running into this problem, is there anything I can do to make >>> it better? I'm using stgit but this is a problem in git itself. >>> >>> I have a patch that splits file A into two files, A and B. >>> Now I merge with another tree and bring in a one line fix to A. >>> The fix touches the pre-split file A in a section that is going to end up in B. >>> Next I re-apply the patch that splits A into A and B. >>> >>> This results in a large conflict in the post split file A. >>> And no patch being applied to file B which is where the fix belongs. >>> >>> Repeat this process with a multi-line fix and the whole automated >>> merge process breaks down and I have to carefully figure everything >>> out by hand. >>> >>> The merge process seems to be unaware of the newly created file B. No >>> patches or conflict ever end up in it. >>> >> >> Can you provide a test case or at least a list of commands which you are >> issuing? You complain about "merge", but you say you are "applying a >> patch". Are you merging that patch from another branch, or are you >> really applying it as a patch (git-apply/cherry-pick/rebase/what-not)? > > What git command does stgit use internally on push/pop? > > It's the stg push of a patch creating a split on top of a change to > the section that is going to end up in file B that causes the problem. I see. So it's really rebasing/applying here rather then merging. I don't think they have the necessary info in order to do content-based patching across file boundaries. Michael