Re: [Bug-wget] [PATCH] GnuTLS certificate loading

[Giuseppe Scrivano]

Tim Rühsen <address@hidden> writes:


> commit 76ad566279df2be6ab2229621ecd1f32cbc043a3
> Merge: ec04e74 ffb9403
> Author: Tim Ruehsen <address@hidden>
> Date:   Wed Jul 24 22:44:06 2013 +0200
>
>     Merge branch 'master' of git://git.savannah.gnu.org/wget
>
> commit ec04e74ff893f19b1e885fda24cf4d6f3fe9cd82
> Author: Tim Ruehsen <address@hidden>
> Date:   Wed Jul 24 22:44:01 2013 +0200
>
>     xxx
>
> commit ffb94036f2116649a8de1a930820056aea9cb65f
> Author: Tim Ruehsen <address@hidden>
> Date:   Tue Jul 23 15:45:30 2013 +0200
>
>     openssl: fix build.
>
> commit e22095a7641c8a74ed6b3566ad96e2bbb99258c7
> Merge: 563cd95 92035db
> Author: Tim Ruehsen <address@hidden>
> Date:   Tue Jul 23 12:49:12 2013 +0200
>
>     Merge branch 'master' of git://git.savannah.gnu.org/wget
>     
>     Conflicts:
>         configure.ac
>         src/http-ntlm.c
>         src/http.c


I am afraid that your local version is substantially different from
origin/master.

I don't think you should have these merges at all in your history, I
suggest you to start from a fresh cloned repo or rollback to the first
commit that is in common and then pull from origin/master (ensuring it
is a fast-forward update).

Giuseppe