All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] builtin-apply: keep information about files to be deleted
Date: Mon, 13 Apr 2009 15:51:52 +0200	[thread overview]
Message-ID: <20090413155152.726647d8@gmail.com> (raw)
In-Reply-To: <1239478260-7420-1-git-send-email-michal.kiedrowicz@gmail.com>

Dnia 2009-04-11, o godz. 21:31:00
Michał Kiedrowicz <michal.kiedrowicz@gmail.com> napisał(a):

> Example correct diff generated by `diff -M -B' might look like this:
> 
> 	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
> 
> 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.
> 
> This patch populates fn_table with information about removal of files
> before calling check_patch() for each patch to be applied.
> 
> Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>

Can anyone comment on this patch? It should fix bug mentioned at

http://www.spinics.net/lists/git/msg100481.html

-- 
Michał Kiedrowicz

  reply	other threads:[~2009-04-13 13:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-11 19:31 [PATCH] builtin-apply: keep information about files to be deleted Michał Kiedrowicz
2009-04-13 13:51 ` Michał Kiedrowicz [this message]
2009-04-13 18:51 ` Junio C Hamano
2009-04-13 21:03   ` Michał Kiedrowicz
2009-04-13 21:30     ` Junio C Hamano
2009-04-17 17:23       ` Michał Kiedrowicz
2009-04-18  4:59         ` Junio C Hamano
2009-04-18 11:27           ` Andreas Ericsson
2009-04-18 19:56             ` Junio C Hamano
2009-04-18 20:58           ` Michał Kiedrowicz
2009-04-18 21:03             ` [PATCH] tests: make test-apply-criss-cross-rename more robust Michał Kiedrowicz
2009-04-18 22:05             ` [PATCH] builtin-apply: keep information about files to be deleted Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090413155152.726647d8@gmail.com \
    --to=michal.kiedrowicz@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.