:: Re: [DNG] Apply Rainer's patch to n…
Góra strony
Delete this message
Reply to this message
Autor: Arnt Karlsen
Data:  
Dla: dng
Temat: Re: [DNG] Apply Rainer's patch to netman.
On Sun, 20 Dec 2015 13:02:28 +0100, aitor_czr wrote in message
<567698D4.1080901@???>:

> 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


...or $ git diff --relative > ../aitor_czr-$(date +%FT%T-%Z).patch
oooooooooooooooooor ;o) $ git diff --relative > \
../aitor_czr-$(git log |head -n1 |cut -d" " -f2)-$(date +%FT%T-%Z).patch


--
..med vennlig hilsen = with Kind Regards from Arnt Karlsen
...with a number of polar bear hunters in his ancestry...
Scenarios always come in sets of three:
best case, worst case, and just in case.