Re: Invoking 'patch' failed.



On 13 May 2013 11:22, Luc Pionchon <pionchon luc gmail com> wrote:
Invoking 'patch' failed.

Maybe you don't have 'GNU patch' installed,
or you use an untested version of Git.

- meld version: '1.6.1'
- source control software type: 'Git'
- source control software version: '1.8.1.2'
- the output of 'git diff --relative HEAD somefile.txt'
- patch command: 'patch -p1 -R -d /tmp/tmpfuVkh8-meld'


It fails on a binary file:

$ git diff --relative HEAD firefox/stylish.sqlite
diff --git a/firefox/stylish.sqlite b/firefox/stylish.sqlite
index dfd587f..3f71069 100644
Binary files a/firefox/stylish.sqlite and b/firefox/stylish.sqlite differ


Probably meld should behave as if we ran:
$ meld  /tmp/tmpfDlICp-meld/firefox/stylish.sqlite firefox/stylish.sqlite

That is: showing both panes with "firefox/stylish.sqlite appears to be
a binary file."

This works for me in 1.7.x, where by 'works' I mean that there's no
patch error, and it shows an error message indicating that it's
binary.

cheers,
Kai


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]