tests/test-patchbomb.out
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 4597 ec431334e4fc
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     1
adding a
4596
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
     2
This patch series consists of 1 patches.
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
     3
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
     4
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
     5
Displaying [PATCH] a ...
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
     6
Content-Type: text/plain; charset="us-ascii"
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
     7
MIME-Version: 1.0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
     8
Content-Transfer-Encoding: 7bit
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
     9
Subject: [PATCH] a
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    10
X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
4565
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    11
Message-Id: <8580ff50825a50c8f716.60@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    12
Date: Thu, 01 Jan 1970 00:01:00 +0000
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    13
From: quux
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    14
To: foo
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    15
Cc: bar
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    16
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    17
# HG changeset patch
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    18
# User test
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    19
# Date 1 0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    20
# Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    21
# Parent  0000000000000000000000000000000000000000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    22
a
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    23
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    24
diff -r 000000000000 -r 8580ff50825a a
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    25
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    26
+++ b/a	Thu Jan 01 00:00:01 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    27
@@ -0,0 +1,1 @@
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    28
+a
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    29
4596
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    30
adding b
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    31
This patch series consists of 2 patches.
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    32
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    33
4596
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    34
Write the introductory message for the patch series.
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    35
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    36
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    37
Displaying [PATCH 0 of 2] test ...
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    38
Content-Type: text/plain; charset="us-ascii"
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    39
MIME-Version: 1.0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    40
Content-Transfer-Encoding: 7bit
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    41
Subject: [PATCH 0 of 2] test
4565
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    42
Message-Id: <patchbomb.120@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    43
Date: Thu, 01 Jan 1970 00:02:00 +0000
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    44
From: quux
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    45
To: foo
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    46
Cc: bar
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    47
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    48
4596
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    49
Displaying [PATCH 1 of 2] a ...
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    50
Content-Type: text/plain; charset="us-ascii"
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    51
MIME-Version: 1.0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    52
Content-Transfer-Encoding: 7bit
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    53
Subject: [PATCH 1 of 2] a
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    54
X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
4565
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    55
Message-Id: <8580ff50825a50c8f716.121@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    56
In-Reply-To: <patchbomb.120@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    57
Date: Thu, 01 Jan 1970 00:02:01 +0000
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    58
From: quux
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    59
To: foo
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    60
Cc: bar
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    61
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    62
# HG changeset patch
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    63
# User test
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    64
# Date 1 0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    65
# Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    66
# Parent  0000000000000000000000000000000000000000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    67
a
4421
d0be96c694f7 Fix up patchbomb test
Brendan Cully <brendan@kublai.com>
parents: 4420
diff changeset
    68
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    69
diff -r 000000000000 -r 8580ff50825a a
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    70
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    71
+++ b/a	Thu Jan 01 00:00:01 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    72
@@ -0,0 +1,1 @@
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    73
+a
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    74
4596
8e37342cb05d patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com>
parents: 4595
diff changeset
    75
Displaying [PATCH 2 of 2] b ...
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    76
Content-Type: text/plain; charset="us-ascii"
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    77
MIME-Version: 1.0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    78
Content-Transfer-Encoding: 7bit
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    79
Subject: [PATCH 2 of 2] b
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    80
X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
4565
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    81
Message-Id: <97d72e5f12c7e84f8506.122@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    82
In-Reply-To: <patchbomb.120@
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
    83
Date: Thu, 01 Jan 1970 00:02:02 +0000
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    84
From: quux
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    85
To: foo
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    86
Cc: bar
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    87
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    88
# HG changeset patch
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    89
# User test
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    90
# Date 2 0
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    91
# Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    92
# Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    93
b
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    94
4595
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    95
diff -r 8580ff50825a -r 97d72e5f12c7 b
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    96
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    97
+++ b/b	Thu Jan 01 00:00:02 1970 +0000
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    98
@@ -0,0 +1,1 @@
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
    99
+b
f7f2bd7f981d test-patchbomb: fix non-existing --date parameter and filtering regexps.
Patrick Mezard <pmezard@gmail.com>
parents: 4421
diff changeset
   100
4565
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   101
This patch series consists of 2 patches.
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   102
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   103
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   104
Write the introductory message for the patch series.
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   105
8b87bd4fb7ce Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4563
diff changeset
   106
4563
1cf908c00479 Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4430
diff changeset
   107
Writing [PATCH 0 of 2] test ...
1cf908c00479 Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4430
diff changeset
   108
Writing [PATCH 1 of 2] a ...
1cf908c00479 Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4430
diff changeset
   109
Writing [PATCH 2 of 2] b ...