Mercurial > hg
view tests/test-patchbomb.out @ 8471:e88cc16ba603
patchbomb: fix help to reflect actual operation
In the body, the description is shown in its entirety,
unstripped from what was already in the subject.
author | Cédric Duval <cedricduval@free.fr> |
---|---|
date | Sun, 17 May 2009 09:45:49 +0200 |
parents | 3e544c074459 |
children | 252232621165 |
line wrap: on
line source
adding a This patch series consists of 1 patches. Displaying [PATCH] a ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a adding b This patch series consists of 2 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 2] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 2] test Message-Id: <patchbomb.120@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:02:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 2] a ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 2] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.121@ In-Reply-To: <patchbomb.120@ References: <patchbomb.120@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:02:01 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a Displaying [PATCH 2 of 2] b ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 2 of 2] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.122@ In-Reply-To: <patchbomb.120@ References: <patchbomb.120@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:02:02 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b This patch series consists of 2 patches. Write the introductory message for the patch series. Writing [PATCH 0 of 2] test ... Writing [PATCH 1 of 2] a ... Writing [PATCH 2 of 2] b ... adding c % test bundle and description searching for changes 1 changesets found Displaying test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: test Message-Id: <patchbomb.180@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:03:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit a multiline description --=== Content-Type: application/x-mercurial-bundle MIME-Version: 1.0 Content-Disposition: attachment; filename="bundle.hg" Content-Transfer-Encoding: base64 SEcxMEJaaDkxQVkmU1nvR7I3AAAN////lFYQWj1/4HwRkdC/AywIAk0E4pfoSIIIgQCgGEQOcLAA 2tA1VPyp4mkeoG0EaaPU0GTT1GjRiNPIg9CZGBqZ6UbU9J+KFU09DNUaGgAAAAAANAGgAAAAA1U8 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC Q70eyNw= --=== % utf-8 patch adding description adding utf % no mime encoding for email --test % md5sum of 8-bit output e726c29b3008e77994c7572563e57c34 mailtest % mime encoded mbox (base64) This patch series consists of 1 patches. Writing [PATCH] charset=utf-8; content-transfer-encoding: base64 ... From quux Thu Jan 01 00:04:01 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a Message-Id: <c3c9e37db9f4fe4882cd.240@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:04:00 +0000 From: quux To: foo Cc: bar IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgYzNj OWUzN2RiOWY0ZmU0ODgyY2RhMzliYWY0MmZlZDZiYWQ4YjE1YQojIFBhcmVudCAgZmYyYzlmYTIw MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5ZgpjaGFyc2V0PXV0Zi04OyBjb250ZW50LXRy YW5zZmVyLWVuY29kaW5nOiBiYXNlNjQKCmRpZmYgLXIgZmYyYzlmYTIwMThiIC1yIGMzYzllMzdk YjlmNCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCAr MDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAKQEAg LTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5ZmEy MDE4YiAtciBjM2M5ZTM3ZGI5ZjQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDowMDow MCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAKQEAg LTAsMCArMSwxIEBACitow7ZtbWEhCg== % mime encoded mbox (quoted-printable) adding qp % no mime encoding for email --test % md5sum of qp output 0402c7d033e04044e423bb04816f9dae mailtest % mime encoded mbox (quoted-printable) This patch series consists of 1 patches. Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ... From quux Thu Jan 01 00:04:01 1970 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 Message-Id: <c655633f8c87700bb38c.240@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:04:00 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 4 0 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a charset=3Dutf-8; content-transfer-encoding: quoted-printable diff -r c3c9e37db9f4 -r c655633f8c87 qp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qp Thu Jan 01 00:00:04 1970 +0000 @@ -0,0 +1,4 @@ +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foo + +bar % iso-8859-1 patch adding isolatin % fake ascii mbox This patch series consists of 1 patches. Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ... % md5sum of 8-bit output 9ea043d8fc43a71045114508baed144b mboxfix % test diffstat for single patch This patch series consists of 1 patches. c c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Displaying [PATCH] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH] test X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f Message-Id: <ff2c9fa2018b15fa74b3.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch # User test # Date 3 0 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c diff -r 97d72e5f12c7 -r ff2c9fa2018b c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,1 @@ +c % test diffstat for multiple patches This patch series consists of 2 patches. a a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) b b | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Final summary: a | 1 + b | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Write the introductory message for the patch series. Displaying [PATCH 0 of 2] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 2] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar a | 1 + b | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Displaying [PATCH 1 of 2] a ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 2] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a Displaying [PATCH 2 of 2] b ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 2 of 2] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.62@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux To: foo Cc: bar b | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b % test inline for single patch This patch series consists of 1 patches. Displaying [PATCH] test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH] test X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f Message-Id: <ff2c9fa2018b15fa74b3.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=t2.patch # HG changeset patch # User test # Date 3 0 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c diff -r 97d72e5f12c7 -r ff2c9fa2018b c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,1 @@ +c --=== % test inline for single patch (quoted-printable) This patch series consists of 1 patches. Displaying [PATCH] test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH] test X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 Message-Id: <c655633f8c87700bb38c.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename=t2.patch # HG changeset patch # User test # Date 4 0 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a charset=3Dutf-8; content-transfer-encoding: quoted-printable diff -r c3c9e37db9f4 -r c655633f8c87 qp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qp Thu Jan 01 00:00:04 1970 +0000 @@ -0,0 +1,4 @@ +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foo + +bar --=== % test inline for multiple patches This patch series consists of 3 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 3] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 3] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 3] a ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 1 of 3] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=t2-1.patch # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a --=== Displaying [PATCH 2 of 3] b ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 2 of 3] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.62@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=t2-2.patch # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b --=== Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 Message-Id: <c655633f8c87700bb38c.63@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:03 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename=t2-3.patch # HG changeset patch # User test # Date 4 0 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a charset=3Dutf-8; content-transfer-encoding: quoted-printable diff -r c3c9e37db9f4 -r c655633f8c87 qp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qp Thu Jan 01 00:00:04 1970 +0000 @@ -0,0 +1,4 @@ +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foo + +bar --=== % test attach for single patch This patch series consists of 1 patches. Displaying [PATCH] test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH] test X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f Message-Id: <ff2c9fa2018b15fa74b3.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Patch subject is complete summary. --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=t2.patch # HG changeset patch # User test # Date 3 0 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c diff -r 97d72e5f12c7 -r ff2c9fa2018b c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,1 @@ +c --=== % test attach for single patch (quoted-printable) This patch series consists of 1 patches. Displaying [PATCH] test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH] test X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 Message-Id: <c655633f8c87700bb38c.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Patch subject is complete summary. --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=t2.patch # HG changeset patch # User test # Date 4 0 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a charset=3Dutf-8; content-transfer-encoding: quoted-printable diff -r c3c9e37db9f4 -r c655633f8c87 qp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qp Thu Jan 01 00:00:04 1970 +0000 @@ -0,0 +1,4 @@ +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foo + +bar --=== % test attach for multiple patches This patch series consists of 3 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 3] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 3] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 3] a ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 1 of 3] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Patch subject is complete summary. --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=t2-1.patch # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a --=== Displaying [PATCH 2 of 3] b ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 2 of 3] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.62@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Patch subject is complete summary. --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=t2-2.patch # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b --=== Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 Message-Id: <c655633f8c87700bb38c.63@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:03 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Patch subject is complete summary. --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=t2-3.patch # HG changeset patch # User test # Date 4 0 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a charset=3Dutf-8; content-transfer-encoding: quoted-printable diff -r c3c9e37db9f4 -r c655633f8c87 qp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qp Thu Jan 01 00:00:04 1970 +0000 @@ -0,0 +1,4 @@ +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx= xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foo + +bar --=== % test intro for single patch This patch series consists of 1 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 1] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 1] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 1] c ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 1] c X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f Message-Id: <ff2c9fa2018b15fa74b3.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 3 0 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c diff -r 97d72e5f12c7 -r ff2c9fa2018b c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,1 @@ +c % test intro for multiple patches This patch series consists of 2 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 2] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 2] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 2] a ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 2] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a Displaying [PATCH 2 of 2] b ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 2 of 2] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.62@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b % tagging csets % test inline for single named patch This patch series consists of 1 patches. Displaying [PATCH] test ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH] test X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f Message-Id: <ff2c9fa2018b15fa74b3.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=two.diff # HG changeset patch # User test # Date 3 0 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c diff -r 97d72e5f12c7 -r ff2c9fa2018b c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,1 @@ +c --=== % test inline for multiple named/unnamed patches This patch series consists of 2 patches. Write the introductory message for the patch series. Displaying [PATCH 0 of 2] test ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 2] test Message-Id: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar Displaying [PATCH 1 of 2] a ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 1 of 2] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab Message-Id: <8580ff50825a50c8f716.61@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=t2-1.patch # HG changeset patch # User test # Date 1 0 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a diff -r 000000000000 -r 8580ff50825a a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,1 @@ +a --=== Displaying [PATCH 2 of 2] b ... Content-Type: multipart/mixed; boundary="=== MIME-Version: 1.0 Subject: [PATCH 2 of 2] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 Message-Id: <97d72e5f12c7e84f8506.62@ In-Reply-To: <patchbomb.60@ References: <patchbomb.60@ User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux To: foo Cc: bar --=== Content-Type: text/x-patch; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=one.patch # HG changeset patch # User test # Date 2 0 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b diff -r 8580ff50825a -r 97d72e5f12c7 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:02 1970 +0000 @@ -0,0 +1,1 @@ +b --=== % test inreplyto This patch series consists of 1 patches. Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ... Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6 Message-Id: <e317db6a6f288748d1f6.60@ In-Reply-To: baz References: baz User-Agent: Mercurial-patchbomb Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux To: foo Cc: bar # HG changeset patch # User test # Date 0 0 # Node ID e317db6a6f288748d1f6cb064f3810fcba66b1b6 # Parent eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff Added tag two, two.diff for changeset ff2c9fa2018b diff -r eae5fcf795ee -r e317db6a6f28 .hgtags --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 @@ -2,3 +2,5 @@ 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch +ff2c9fa2018b15fa74b33363bda9527323e2a99f two +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff