From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?TWljaGHFgg==?= Kiedrowicz Subject: Re: [PATCH] builtin-apply: keep information about files to be deleted Date: Mon, 13 Apr 2009 15:51:52 +0200 Message-ID: <20090413155152.726647d8@gmail.com> References: <1239478260-7420-1-git-send-email-michal.kiedrowicz@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: Git Mailing List X-From: git-owner@vger.kernel.org Mon Apr 13 15:54:05 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 1LtMbZ-0004wA-Cp for gcvg-git-2@gmane.org; Mon, 13 Apr 2009 15:53:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751983AbZDMNwM convert rfc822-to-quoted-printable (ORCPT ); Mon, 13 Apr 2009 09:52:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751856AbZDMNwL (ORCPT ); Mon, 13 Apr 2009 09:52:11 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:52654 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbZDMNwK convert rfc822-to-8bit (ORCPT ); Mon, 13 Apr 2009 09:52:10 -0400 Received: by fxm2 with SMTP id 2so1997383fxm.37 for ; Mon, 13 Apr 2009 06:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=9MFVkyW7QzQNXxQwkG62kgk+JoCI1uM0DFC/E5qbKUA=; b=c9aL8qVv2LpvUys8BAKTjmXDNAV+7hYmfv+C5k/v1+1SUOQ5ZTqHgdOU6WVDsvSAQh +GhTSPRydNWEyKufPZPR3I3P3YazHXpspxp3W2UjUe9LozZ24xejhonqrIU+o3/2rlEi 7t81K9v2zGcO3NjVSReZ9Yxb/Un0lfiXlO7Rk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; b=r1VUbQCXQBtG/rgzfLfngTgisKkl6BoqA27D15HtD9it5Bi6NLGtEa7cWoJECfLWLj Y2/lMyA+i2ZdXNZkGgU8CwRvQ/NdHOvWNqf+6iOlT9rwxByJXq0qhW7WFJ5/noZ/+Jce TDJ4F79i6sQl2afed1iEboD2Z+nb21voXZ1U8= Received: by 10.86.93.17 with SMTP id q17mr4743746fgb.75.1239630729053; Mon, 13 Apr 2009 06:52:09 -0700 (PDT) Received: from localhost (87-205-63-203.adsl.inetia.pl [87.205.63.203]) by mx.google.com with ESMTPS id d6sm6764936fga.12.2009.04.13.06.52.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 13 Apr 2009 06:52:08 -0700 (PDT) In-Reply-To: <1239478260-7420-1-git-send-email-michal.kiedrowicz@gmail.com> X-Mailer: Claws Mail 3.7.0 (GTK+ 2.14.7; x86_64-pc-linux-gnu) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Dnia 2009-04-11, o godz. 21:31:00 Micha=C5=82 Kiedrowicz napisa=C5=82(a): > Example correct diff generated by `diff -M -B' might look like this: >=20 > diff --git a/file1 b/file2 > similarity index 100% > rename from file1 > rename to file2 > diff --git a/file2 b/file1 > similarity index 100% > rename from file2 > rename to file1 >=20 > Information about removing `file2' comes after information about > creation of new `file2' (renamed from `file1'). Existing > implementation isn't able to apply such patch, because it has to know > in advance which files will be removed. >=20 > This patch populates fn_table with information about removal of files > before calling check_patch() for each patch to be applied. >=20 > Signed-off-by: Micha=C5=82 Kiedrowicz Can anyone comment on this patch? It should fix bug mentioned at http://www.spinics.net/lists/git/msg100481.html --=20 Micha=C5=82 Kiedrowicz