From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jon Seymour <jon.seymour@gmail.com>
Subject: Re: [PATCH] Fix rename/copy when dealing with temporarily broken pairs.
Date: Tue, 14 Jun 2005 02:24:16 +1000
Message-ID: <2cfc4032050613092462d3a456@mail.gmail.com>
References: <7vfyvpxlqi.fsf@assigned-by-dhcp.cox.net>
	 <7vwtp0p6tz.fsf@assigned-by-dhcp.cox.net>
Reply-To: jon@blackcubes.dyndns.org
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7BIT
Cc: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Mon Jun 13 18:21:38 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([12.107.209.244])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1DhrgG-0000gr-HI
	for gcvg-git@gmane.org; Mon, 13 Jun 2005 18:20:56 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S261797AbVFMQZa (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Mon, 13 Jun 2005 12:25:30 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261769AbVFMQY0
	(ORCPT <rfc822;git-outgoing>); Mon, 13 Jun 2005 12:24:26 -0400
Received: from rproxy.gmail.com ([64.233.170.201]:31578 "EHLO rproxy.gmail.com")
	by vger.kernel.org with ESMTP id S261765AbVFMQYR convert rfc822-to-8bit
	(ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 13 Jun 2005 12:24:17 -0400
Received: by rproxy.gmail.com with SMTP id i8so1220348rne
        for <git@vger.kernel.org>; Mon, 13 Jun 2005 09:24:16 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        b=dQwh6H9PnGlWJL9g0V2MJyTTB9grs7eQZQnGAXHp/4Fl27P4VwoMw6RzLtSUz/yxKwM6O5L2jDoK54442gQCQOSgMO96PNsFJI14NkRUGKx3LgVSsvb0BGI4uagdUDHj5saKEIXILYDTnClJcmQoEBTox1C/s02Xk8jJS6pMrxM=
Received: by 10.38.101.33 with SMTP id y33mr1073084rnb;
        Mon, 13 Jun 2005 09:24:16 -0700 (PDT)
Received: by 10.38.104.42 with HTTP; Mon, 13 Jun 2005 09:24:16 -0700 (PDT)
To: Junio C Hamano <junkio@cox.net>
In-Reply-To: <7vwtp0p6tz.fsf@assigned-by-dhcp.cox.net>
Content-Disposition: inline
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org

G'day Junio,

On 6/12/05, Junio C Hamano <junkio@cox.net> wrote:
> When rename/copy uses a file that was broken by diffcore-break
> as the source, and the broken filepair gets merged back later,
> the output was mislabeled as a rename.  In this case, the source
> file ends up staying in the output, so we should label it as a
> copy instead.

I've got a patch series that renames a file, but the patches generated by your
git-format-patch-script fail to rename the file to the new name.

I wondered if this patch might fix it, but it doesn't seem to.

Here's a hunk from the patch:

diff --git a/epoch.c b/traversal.c
similarity index 100%
rename from epoch.c
rename to traversal.c
--- a/epoch.c
+++ b/traversal.c
@@ -14,7 +14,7 @@

 #include "cache.h"
 #include "commit.h"
-#include "epoch.h"
+#include "traversal.h"

 struct fraction {
        BIGNUM numerator;

What tool am I meant to be using to apply the patch? 

I am currently using "patch -p1"

jon.