The branch master has been updated
  discards  ae0b9d5e0f284758eb8b5998a530ee25c52a6bb4 (commit)
       via  a8cb4667b61d9c91e7fcfb0aa056d3226950ab20 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (ae0b9d5e0f284758eb8b5998a530ee25c52a6bb4)
            \
             N -- N -- N (a8cb4667b61d9c91e7fcfb0aa056d3226950ab20)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


- Log -----------------------------------------------------------------
commit a8cb4667b61d9c91e7fcfb0aa056d3226950ab20
Author: Richard Levitte <levi...@openssl.org>
Date:   Tue Feb 13 15:17:00 2018 +0100

    Add 1.1.1 stuff

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 37b91be..55a89c4 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,15 @@ define makemanpages
        ./bin/mk-filelist -a docs/man$(2)/crypto '' '*.html' 
>docs/man$(2)/crypto/index.inc
        ./bin/mk-filelist -a docs/man$(2)/ssl '' '*.html' 
>docs/man$(2)/ssl/index.inc
 endef
+define newmakemanpages
+       ./bin/mk-manpages $(1) $(2) docs
+       ./bin/mk-filelist -a docs/man$(2)/man1 '' '*.html' 
>docs/man$(2)/man1/index.inc
+       ./bin/mk-filelist -a docs/man$(2)/man3 '' '*.html' 
>docs/man$(2)/man3/index.inc
+       ./bin/mk-filelist -a docs/man$(2)/man5 '' '*.html' 
>docs/man$(2)/man5/index.inc
+       ./bin/mk-filelist -a docs/man$(2)/man7 '' '*.html' 
>docs/man$(2)/man7/index.inc
+endef
 manpages: manmaster
-       $(call makemanpages,$(CHECKOUTS)/openssl-1.1.1-stable,1.1.1)
+       $(call newmakemanpages,$(CHECKOUTS)/openssl-1.1.1-stable,1.1.1)
        $(call makemanpages,$(CHECKOUTS)/openssl-1.1.0-stable,1.1.0)
        $(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2)
 
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

Reply via email to