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 contained > > stuff like > > > > ----------------------- > > 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. > > ... > > ----------------------- > > 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
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.
>
> 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
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
pgpnrV4fdq4Z2.pgp
Description: PGP signature
