<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">

<html lang="en">

<head>

<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">

<title>

GitLab

</title>

<style>img {

max-width: 100%; height: auto;

}

</style>

</head>

<body>

<div class="content">

<p style="color: #777777;">

<a href="https://gitlab.com/kaoh">Karsten Ohme</a>

commented:

</p>

<div style="">

<p dir="auto">I tried it a top of the other patch and without it, but it does not run cleanly. I get:</p>

<p dir="auto">error: patch failed: NEWS:10

error: NEWS: patch does not apply

error: patch failed: lib/includes/gnutls/gnutls.h.in:2579

error: lib/includes/gnutls/gnutls.h.in: patch does not apply

error: patch failed: lib/x509/common.c:537

error: lib/x509/common.c: patch does not apply

error: patch failed: lib/x509/output.c:144

error: lib/x509/output.c: patch does not apply

error: patch failed: tests/Makefile.am:50

error: tests/Makefile.am: patch does not apply

error: tests/certs-interesting/cert10.der: already exists in working directory

error: cannot apply binary patch to 'tests/certs-interesting/cert5.der' without full index line

error: tests/certs-interesting/cert5.der: patch does not apply</p>

<p dir="auto">Do I have to merge it?</p>

</div>

</div>

<div class="footer" style="margin-top: 10px;">

<p style="font-size: small; color: #777;">

—

<br>

Reply to this email directly or <a href="https://gitlab.com/gnutls/gnutls/merge_requests/1030#note_194107579">view it on GitLab</a>.

<br>

You're receiving this email because of your account on gitlab.com.

If you'd like to receive fewer emails, you can

<a href="https://gitlab.com/sent_notifications/cc0fe4a39e46ae77c6b60e966190a704/unsubscribe">unsubscribe</a>

from this thread or

adjust your notification settings.

<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Merge request","url":"https://gitlab.com/gnutls/gnutls/merge_requests/1030#note_194107579"}}</script>

</p>

</div>

</body>

</html>