:: Re: [DNG] Apply Rainer's patch to n…
Góra strony
Delete this message
Reply to this message
Autor: aitor_czr
Data:  
Dla: Edward Bartolo, Rainer Weikusat, dng
Temat: Re: [DNG] Apply Rainer's patch to netman.
Hi Edward,

On 12/20/2015 06:14 AM, Edward Bartolo wrote:
>> On 12/19/2015 05:52 PM, Edward Bartolo<edbarx@???> wrote:
>>>> >> >The command:
>>>> >> >edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git patch
>>>> >> >../rainer_dng-15.12.2015.patch
>> >
>> >The right command is this other one:
>> >
>> >$ git apply --stat ../rainer_dng-15.12.2015.patch
> Hi Aitor,
>
> Thanks for your reply. Git is reporting that the patch is corrupted. I
> informed Rainer about that.
>
> Edward


Rainer's patch is not corrupted:

$ git apply --stat ../rainer_dng-15.12.2015.patch
  Makefile                      |   10 +++++++++-
  debian/netman-backend.install |    2 +-
  debian/rules                  |    9 ---------
  3 files changed, 10 insertions(+), 11 deletions(-)


You can generate a patch in the parent directory by the following way:

$ git diff --relative > ../aitor_czr-20.2.2015.patch

Cheers,

    Aitor.