> "Jeff" == Jeff Janes writes:
Jeff> I used "git diff" configured to use
Jeff> src/tools/git-external-diff, as described here:
hmm...
so that git-external-diff script is trying to fake git diff output,
including using 'diff -git' and index lines, but the context-diff
output wouldn't work
On Mon, Sep 16, 2013 at 12:11 PM, Andrew Gierth wrote:
> > "Josh" == Josh Berkus writes:
>
> Josh> The issue isn't that, it's that git apply is just buggy and
> Josh> can't tell the difference between a new file and a modified
> Josh> one.
>
> It's not the fault of git apply; the patch co
On 09/15/2013 11:46 PM, Ashutosh Bapat wrote:
> On Sun, Sep 15, 2013 at 12:38 AM, Andres Freund wrote:
>> git reset?
>>
>>
> git reset wouldn't remove the files that were newly added by the patch,
> would it?
The issue isn't that, it's that git apply is just buggy and can't tell
the difference bet
> "Josh" == Josh Berkus writes:
Josh> The issue isn't that, it's that git apply is just buggy and
Josh> can't tell the difference between a new file and a modified
Josh> one.
It's not the fault of git apply; the patch contained explicit
annotations on all the files claiming that they were
On 2013-09-16 10:16:37 +0530, Ashutosh Bapat wrote:
> On Sun, Sep 15, 2013 at 12:38 AM, Andres Freund wrote:
>
> > On 2013-09-14 15:03:52 -0400, Andrew Dunstan wrote:
> > >
> > > On 09/14/2013 02:37 PM, Josh Berkus wrote:
> > > >Folks,
> > > >
> > > >Lately I've been running into a lot of reports
On Sun, Sep 15, 2013 at 12:38 AM, Andres Freund wrote:
> On 2013-09-14 15:03:52 -0400, Andrew Dunstan wrote:
> >
> > On 09/14/2013 02:37 PM, Josh Berkus wrote:
> > >Folks,
> > >
> > >Lately I've been running into a lot of reports of false conflicts
> > >reported by "git apply". The most recent on
On Sat, 2013-09-14 at 11:37 -0700, Josh Berkus wrote:
> Lately I've been running into a lot of reports of false conflicts
> reported by "git apply". The most recent one was the "points" patch,
> which git apply rejected for completely ficticious reasons (it claimed
> that the patch was trying to c
On 09/14/2013 03:08 PM, Andres Freund wrote:
On 2013-09-14 15:03:52 -0400, Andrew Dunstan wrote:
On 09/14/2013 02:37 PM, Josh Berkus wrote:
Folks,
Lately I've been running into a lot of reports of false conflicts
reported by "git apply". The most recent one was the "points" patch,
which git
On 2013-09-14 15:03:52 -0400, Andrew Dunstan wrote:
>
> On 09/14/2013 02:37 PM, Josh Berkus wrote:
> >Folks,
> >
> >Lately I've been running into a lot of reports of false conflicts
> >reported by "git apply". The most recent one was the "points" patch,
> >which git apply rejected for completely
On 09/14/2013 02:37 PM, Josh Berkus wrote:
Folks,
Lately I've been running into a lot of reports of false conflicts
reported by "git apply". The most recent one was the "points" patch,
which git apply rejected for completely ficticious reasons (it claimed
that the patch was trying to create a
10 matches
Mail list logo
