Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Richard Levitte
On Tue, 21 Apr 2020 19:55:41 +0200, Quanah Gibson-Mount wrote: > --On Tuesday, April 21, 2020 11:25 AM -0700 Norm Green > wrote: > > > >I use the git release tags, not the tarballs. > > > > I do too, and I suspect many others do as well. > > The empty krb5 directory has not caused grief for

Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Quanah Gibson-Mount
--On Tuesday, April 21, 2020 11:25 AM -0700 Norm Green wrote: >I use the git release tags, not the tarballs. I do too, and I suspect many others do as well. The empty krb5 directory has not caused grief for me, but it would be nice if the git release tag directory structure matched the

Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Norm Green
>I use the git release tags, not the tarballs. I do too, and I suspect many others do as well. The empty krb5 directory has not caused grief for me, but it would be nice if the git release tag directory structure matched the tarball. Norm Green On 4/21/2020 10:19 AM, Quanah Gibson-Mount

Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Benjamin Kaduk via openssl-users
On Tue, Apr 21, 2020 at 10:19:28AM -0700, Quanah Gibson-Mount wrote: > --On Tuesday, April 21, 2020 11:16 AM -0700 Benjamin Kaduk > wrote: > > > The 'krb5' entry in git is a submodule, used for the external tests. > > It's removed while preparing release tarballs, but I'm not sure what > > you

Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Quanah Gibson-Mount
--On Tuesday, April 21, 2020 11:16 AM -0700 Benjamin Kaduk wrote: The 'krb5' entry in git is a submodule, used for the external tests. It's removed while preparing release tarballs, but I'm not sure what you are doing that's causing conflicts -- are you doing something that involves both

Re: empty directory in the 1.1.1 series release tags

2020-04-21 Thread Benjamin Kaduk via openssl-users
On Tue, Apr 21, 2020 at 10:08:39AM -0700, Quanah Gibson-Mount wrote: > The OpenSSL release tags contain an empty directory "krb5" that does not > exist in the release tarball. This is annoying because when I go to merge > release tags, I constantly get the following: > > CONFLICT

empty directory in the 1.1.1 series release tags

2020-04-21 Thread Quanah Gibson-Mount
The OpenSSL release tags contain an empty directory "krb5" that does not exist in the release tarball. This is annoying because when I go to merge release tags, I constantly get the following: CONFLICT (modify/delete): krb5 deleted in HEAD and modified in OpenSSL_1_1_1e. Version