Re: [PATCH] builtin-apply: keep information about files to be deleted
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 18, 2009, 19:56 UTC
- Message-ID
- <7vws9hviqk.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <49E9B90F.8070204@op5.com>
Andreas Ericsson <exon@op5.com> writes:
Show 12 quoted lines
>> There are two stances we can take: >> >> (1) The user knows what he is doing. >> >> In the first example, if he wanted the change in #3 to end up in B, >> he would have arranged the patches in a different order, namely, 3 1 >> 2, but he didn't. We should modify A (that came from C). >> > > This gets my vote. Standard "diff -u" patches have always had to be > numbered properly if they have even the slightest chance of interfering > with each other, so developers are already used to it.
You stripped the more important part from the quote, where I describe why this would not work well for the second situation. Without addressing it, how could you possibly vote?