| author | Adrian Buehlmann <adrian@cadifra.com> |
| Fri, 19 Feb 2010 21:48:09 +0100 | |
| branch | stable |
| changeset 10513 | 47838dee7d60 |
| parent 10397 | 8cb81d75730c |
| child 10588 | b0b19d61d79a |
| permissions | -rw-r--r-- |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
1 |
%%% plain headers |
|
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
2 |
adding a |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
3 |
% qnew should refuse bad patch names |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
4 |
abort: "series" cannot be used as the name of a patch |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
5 |
abort: "status" cannot be used as the name of a patch |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
6 |
abort: "guards" cannot be used as the name of a patch |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
7 |
abort: ".hgignore" cannot be used as the name of a patch |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
8 |
% qnew with uncommitted changes |
|
10372
27d542bc0f5b
qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents:
10114
diff
changeset
|
9 |
uncommitted.patch |
|
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
10 |
% qnew implies add |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
11 |
A .hgignore |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
12 |
A series |
|
10372
27d542bc0f5b
qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents:
10114
diff
changeset
|
13 |
A uncommitted.patch |
|
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
14 |
% qnew missing |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
15 |
abort: missing: No such file or directory |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
16 |
% qnew -m |
|
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
17 |
foo bar |
|
7614
f9fcb189c8e2
mq: make qnew patch format consistent with qrefresh (issue1457)
Bernhard Leiner <bleiner@gmail.com>
parents:
7297
diff
changeset
|
18 |
|
|
7296
695383442347
mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents:
2714
diff
changeset
|
19 |
% qnew twice |
|
2711
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 |
abort: patch "first.patch" already exists |
|
2714
85070b784896
Fix test-mq-qnew-twice exit code and output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2711
diff
changeset
|
21 |
abort: patch "first.patch" already exists |
|
7297
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
22 |
% qnew -f from a subdirectory |
|
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
7627
diff
changeset
|
23 |
popping first.patch |
|
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
7627
diff
changeset
|
24 |
popping mtest.patch |
|
10372
27d542bc0f5b
qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents:
10114
diff
changeset
|
25 |
popping uncommitted.patch |
| 7627 | 26 |
patch queue now empty |
|
7297
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
27 |
adding d/b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
28 |
M d/b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
29 |
diff --git a/d/b b/d/b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
30 |
--- a/d/b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
31 |
+++ b/d/b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
32 |
@@ -1,1 +1,2 @@ |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
33 |
b |
|
bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents:
7296
diff
changeset
|
34 |
+b |
|
9733
f16ec85f125c
mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents:
9110
diff
changeset
|
35 |
% qnew -u with no username configured |
|
f16ec85f125c
mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents:
9110
diff
changeset
|
36 |
From: blue |
|
f16ec85f125c
mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents:
9110
diff
changeset
|
37 |
|
|
10114
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
38 |
% fail when trying to import a merge |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
39 |
adding a |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
40 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
41 |
created new head |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
42 |
merging a |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
43 |
warning: conflicts during merge. |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
44 |
merging a failed! |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
45 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
46 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
3e7663b2f3fc
mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents:
9733
diff
changeset
|
47 |
abort: cannot manage merge changesets |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
48 |
%%% hg headers |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
49 |
adding a |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
50 |
% qnew should refuse bad patch names |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
51 |
abort: "series" cannot be used as the name of a patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
52 |
abort: "status" cannot be used as the name of a patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
53 |
abort: "guards" cannot be used as the name of a patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
54 |
abort: ".hgignore" cannot be used as the name of a patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
55 |
% qnew with uncommitted changes |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
56 |
uncommitted.patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
57 |
% qnew implies add |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
58 |
A .hgignore |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
59 |
A series |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
60 |
A uncommitted.patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
61 |
% qnew missing |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
62 |
abort: missing: No such file or directory |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
63 |
% qnew -m |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
64 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
65 |
# Parent |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
66 |
foo bar |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
67 |
|
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
68 |
% qnew twice |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
69 |
abort: patch "first.patch" already exists |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
70 |
abort: patch "first.patch" already exists |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
71 |
% qnew -f from a subdirectory |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
72 |
popping first.patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
73 |
popping mtest.patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
74 |
popping uncommitted.patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
75 |
patch queue now empty |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
76 |
adding d/b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
77 |
M d/b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
78 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
79 |
# Parent |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
80 |
diff --git a/d/b b/d/b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
81 |
--- a/d/b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
82 |
+++ b/d/b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
83 |
@@ -1,1 +1,2 @@ |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
84 |
b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
85 |
+b |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
86 |
% qnew -u with no username configured |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
87 |
# HG changeset patch |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
88 |
# Parent |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
89 |
# User blue |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
90 |
% fail when trying to import a merge |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
91 |
adding a |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
92 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
93 |
created new head |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
94 |
merging a |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
95 |
warning: conflicts during merge. |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
96 |
merging a failed! |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
97 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
98 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
10372
diff
changeset
|
99 |
abort: cannot manage merge changesets |