Date: Fri, 27 Feb 2015 20:34:52 +0100 From: Gert Doering Message-ID: <20150227193452.GF8134@...1296...> References: <20150225160718.GA6306@...2009...> <20150227182832.GE8134@...1296...> <20150227192746.GA5936@...2009...> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lnCRbaW8TcgsIoW0" Content-Disposition: inline In-Reply-To: <20150227192746.GA5936@...2009...> Subject: Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vasily Kulikov Cc: openvpn-devel@lists.sourceforge.net --lnCRbaW8TcgsIoW0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, On Fri, Feb 27, 2015 at 10:27:46PM +0300, Vasily Kulikov wrote: > > Sorry to be nagging... something in your patch was garbled, it contain= ed > > stuff like > >=20 > > ----------------------- > > only in patch2: > > unchanged: > > --- a/doc/management-notes.txt > > +++ b/doc/management-notes.txt > > @@ -777,6 +777,28 @@ correct signature. > > This capability is intended to allow the use of arbitrary cryptographic > > service providers with OpenVPN via the management interface. > > ... > > ----------------------- >=20 > This stuff is missing in the patch itself which is in the email text, > and is contained in the attached interdiff file which contains changes > between patch v3 and v4. AFAICS, the patch doesn't contain any garbage. Looking more closely, I can now see what you did - the patch is in the mail text, and the actual attachment is not the patch but the diff between the patches (thus, doc/management-notes.txt appears twice). Did not=20 expect that, and did not look closely enough. > > (the diff for doc/management-notes.txt is in there twice), and there > > is a patch for .gitignore in it as well. >=20 > I've included .gitignore changes as my patch adds Makefile changes. It > would be rather uncomfortable for openvpn developers to see Makefile and > be not able to change it. Mmmh. Actually we don't usually do Makefile changes, as this is always generated by configure for us - so normally, it is good to have it in .gitignore. Of course your subdirectory has a Makefile in it for MacOS X only... So - git experts to the rescue - how's this normally done? (The textual change for doc/management-notes.txt does not warrant an extra patch, I'll change that on the fly) gert --=20 USENET is *not* the non-clickable part of WWW! //www.muc.de/~ge= rt/ Gert Doering - Munich, Germany gert@...1296... fax: +49-89-35655025 gert@...1297... --lnCRbaW8TcgsIoW0 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQCVAwUBVPDG3KkuBuNlUUl1AQKDwAQAuXa2biw780MdJthjtX9z0FNNDNV1gu00 mXBEJzL3qiQ7GMu3qs8Nt98azmd3OaW6Fy0LD17ktVBHWeocrN22bJWeVX6+TYce lAOfXNYaygxeBqm96VuP0QCQUJqbX+W9PBXt/9msOciv4eSENZzVxG6CPlwdH24X LsxwhTBlMhs= =xRo0 -----END PGP SIGNATURE----- --lnCRbaW8TcgsIoW0--