On Thu, Feb 7, 2019 at 2:28 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > diff --git a/Documentation/diff-generate-patch.txt
> > b/Documentation/diff-generate-patch.txt
> > index 231105cff4..69cb3b0349 100644
> > --- a/Documentation/diff-generate-patch.txt
> > +++ b/Documentation/diff
On Thu, Feb 7, 2019 at 3:31 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > Now, the question: In addition to the two "from" headers, how many
> > "to" headers do we emit? In particular, do we emit both a "copied to
> > F" and a "renamed to F" header, or just a combined "renamed/copied
Elijah Newren writes:
> Now, the question: In addition to the two "from" headers, how many
> "to" headers do we emit? In particular, do we emit both a "copied to
> F" and a "renamed to F" header, or just a combined "renamed/copied to
> F" header?
There is only a single path that can be on the "
Elijah Newren writes:
> diff --git a/Documentation/diff-generate-patch.txt
> b/Documentation/diff-generate-patch.txt
> index 231105cff4..69cb3b0349 100644
> --- a/Documentation/diff-generate-patch.txt
> +++ b/Documentation/diff-generate-patch.txt
> @@ -144,6 +144,19 @@ Similar to two-line header
On Thu, Feb 7, 2019 at 12:25 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > I think "copy from" and "rename from" should be relatively
> > straightforward. However, in a combined diff, we could have both a
> > modified status, a renamed status, and a copied status, meaning that
> > we'
Elijah Newren writes:
> I think "copy from" and "rename from" should be relatively
> straightforward. However, in a combined diff, we could have both a
> modified status, a renamed status, and a copied status, meaning that
> we'll need an array of both similarity and dissimilarity indexes...and
On Tue, Feb 5, 2019 at 12:39 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> >> > Further, in patch format, this changes the from/to headers so that
> >> > instead of just having one "from" header, we get one for each parent.
> >> > For example, instead of having
> >> >
> >> > --- a/phoo
Elijah Newren writes:
>> > Further, in patch format, this changes the from/to headers so that
>> > instead of just having one "from" header, we get one for each parent.
>> > For example, instead of having
>> >
>> > --- a/phooey.c
>> > +++ b/phooey.c
>> >
>> > we would see
>> >
>> > --- a/fo
Elijah Newren writes:
> I don't want to get rid of them; the initial reviews of my original
> patch thought the format was ambiguous and would mishandle files with
> tabs in them. But yeah, I can definitely add a few testcases without
> FUNNYNAMES. Sorry for the headache; I'll fix this up.
Tha
Hi Dscho,
On Tue, Feb 5, 2019 at 1:48 AM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> On Mon, 4 Feb 2019, Elijah Newren wrote:
>
> > The combined diff format for merges will only list one filename, even if
> > rename or copy detection is active. For example, with raw format one
> > might see:
>
On Mon, Feb 4, 2019 at 1:20 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> There is one place that says combined-all-paths, and everywhere else
> it says combined-all-names. The former is probably techincally more
> correct, I think ;-)
Looks like I had a mixture of my original name (co
Hi Elijah,
On Mon, 4 Feb 2019, Elijah Newren wrote:
> The combined diff format for merges will only list one filename, even if
> rename or copy detection is active. For example, with raw format one
> might see:
>
> ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
> ::100755 10
Elijah Newren writes:
There is one place that says combined-all-paths, and everywhere else
it says combined-all-names. The former is probably techincally more
correct, I think ;-)
> The combined diff format for merges will only list one filename, even if
> rename or copy detection is active. F
The combined diff format for merges will only list one filename, even if
rename or copy detection is active. For example, with raw format one
might see:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
::100644 100
14 matches
Mail list logo
