Mercurial > hg
comparison tests/test-patchbomb.out @ 4597:ec431334e4fc
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 17 Jun 2007 20:08:06 +0200 |
| parents | 8b87bd4fb7ce 8e37342cb05d |
| children | ea1016b32e94 |
comparison
equal
deleted
inserted
replaced
| 4593:2937d0dbfab0 | 4597:ec431334e4fc |
|---|---|
| 1 adding a | 1 adding a |
| 2 This patch series consists of 1 patches. | |
| 3 | |
| 4 | |
| 5 Displaying [PATCH] a ... | |
| 2 Content-Type: text/plain; charset="us-ascii" | 6 Content-Type: text/plain; charset="us-ascii" |
| 3 MIME-Version: 1.0 | 7 MIME-Version: 1.0 |
| 4 Content-Transfer-Encoding: 7bit | 8 Content-Transfer-Encoding: 7bit |
| 5 Subject: [PATCH] a | 9 Subject: [PATCH] a |
| 6 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab | 10 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
| 21 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 25 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 22 +++ b/a Thu Jan 01 00:00:01 1970 +0000 | 26 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
| 23 @@ -0,0 +1,1 @@ | 27 @@ -0,0 +1,1 @@ |
| 24 +a | 28 +a |
| 25 | 29 |
| 26 This patch series consists of 1 patches. | 30 adding b |
| 31 This patch series consists of 2 patches. | |
| 27 | 32 |
| 28 | 33 |
| 29 Displaying [PATCH] a ... | 34 Write the introductory message for the patch series. |
| 30 adding b | 35 |
| 36 | |
| 37 Displaying [PATCH 0 of 2] test ... | |
| 31 Content-Type: text/plain; charset="us-ascii" | 38 Content-Type: text/plain; charset="us-ascii" |
| 32 MIME-Version: 1.0 | 39 MIME-Version: 1.0 |
| 33 Content-Transfer-Encoding: 7bit | 40 Content-Transfer-Encoding: 7bit |
| 34 Subject: [PATCH 0 of 2] test | 41 Subject: [PATCH 0 of 2] test |
| 35 Message-Id: <patchbomb.120@ | 42 Message-Id: <patchbomb.120@ |
| 37 From: quux | 44 From: quux |
| 38 To: foo | 45 To: foo |
| 39 Cc: bar | 46 Cc: bar |
| 40 | 47 |
| 41 | 48 |
| 49 Displaying [PATCH 1 of 2] a ... | |
| 42 Content-Type: text/plain; charset="us-ascii" | 50 Content-Type: text/plain; charset="us-ascii" |
| 43 MIME-Version: 1.0 | 51 MIME-Version: 1.0 |
| 44 Content-Transfer-Encoding: 7bit | 52 Content-Transfer-Encoding: 7bit |
| 45 Subject: [PATCH 1 of 2] a | 53 Subject: [PATCH 1 of 2] a |
| 46 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab | 54 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
| 62 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 70 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 63 +++ b/a Thu Jan 01 00:00:01 1970 +0000 | 71 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
| 64 @@ -0,0 +1,1 @@ | 72 @@ -0,0 +1,1 @@ |
| 65 +a | 73 +a |
| 66 | 74 |
| 75 Displaying [PATCH 2 of 2] b ... | |
| 67 Content-Type: text/plain; charset="us-ascii" | 76 Content-Type: text/plain; charset="us-ascii" |
| 68 MIME-Version: 1.0 | 77 MIME-Version: 1.0 |
| 69 Content-Transfer-Encoding: 7bit | 78 Content-Transfer-Encoding: 7bit |
| 70 Subject: [PATCH 2 of 2] b | 79 Subject: [PATCH 2 of 2] b |
| 71 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 | 80 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
| 93 | 102 |
| 94 | 103 |
| 95 Write the introductory message for the patch series. | 104 Write the introductory message for the patch series. |
| 96 | 105 |
| 97 | 106 |
| 98 Displaying [PATCH 0 of 2] test ... | |
| 99 Displaying [PATCH 1 of 2] a ... | |
| 100 Displaying [PATCH 2 of 2] b ... | |
| 101 This patch series consists of 2 patches. | |
| 102 | |
| 103 | |
| 104 Write the introductory message for the patch series. | |
| 105 | |
| 106 | |
| 107 Writing [PATCH 0 of 2] test ... | 107 Writing [PATCH 0 of 2] test ... |
| 108 Writing [PATCH 1 of 2] a ... | 108 Writing [PATCH 1 of 2] a ... |
| 109 Writing [PATCH 2 of 2] b ... | 109 Writing [PATCH 2 of 2] b ... |