git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] apply: fix copy/rename breakage

From
DZDon Zickus <dzickus@redhat.com>
Date
Jul 10, 2008, 15:43 UTC
Message-ID
<20080710154348.GC22201@redhat.com>
In-Reply-To
<48762919.6070902@viscovery.net>
On Thu, Jul 10, 2008 at 05:22:01PM +0200, Johannes Sixt wrote:
Show 31 quoted lines
> >> With this patch, we disable the postimage record 'fn_table' when applying
> >> a patch to produce new files out of existing file by copying to fix this
> >> issue.
> > 
> > Odd.  I guess the way I read this workflow is
> > 
> > apply change X to A, copy A' to B, apply change Y to B => B' now has changes X+Y
> > 
> > But instead you are saying B' only has change Y because A is copied to B
> > not A'.
> > 
> > Regardless, it doesn't affect my workflow.
> 
> Oh, it does. It's a normal git diff where a copy was detected!
> 
> Don't let you distract by the word "incremental" and by the names A and B.
> In the example above, the change X comes first because 'A' is sorted
> before 'B'. If the roles of A and B were swapped, then you have this patch:
> 
>  	diff --git a/A b/A
>  	copy from B
>  	copy to A
>  	--- a/A
>  	+++ b/A
>  	... change text Y here ...
>  	diff --git a/A b/B
>  	--- a/A
>  	+++ b/B
>  	... change text X here ...
> 
> See?
Yes, thank you!

Cheers, Don

Previous: Johannes Sixt
Message 6 of 6 in “apply: fix copy/rename breakage”
  1. apply: fix copy/rename breakageJunio C Hamano, Jul 10, 2008
  2. Junio C HamanoJul 10, 2008
  3. Stephan BeyerJul 10, 2008
  4. Don ZickusJul 10, 2008
  5. Johannes SixtJul 10, 2008
  6. Don ZickusJul 10, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.