author | Matt Mackall <mpm@selenic.com> |
Fri, 28 May 2010 14:41:11 -0500 | |
branch | stable |
changeset 11227 | 054549ccb680 |
parent 9110 | 561ff8d9e4f0 |
permissions | -rw-r--r-- |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1 |
adding base |
4737
2ececafa5859
mq: more qdelete help text tweaks
Brendan Cully <brendan@kublai.com>
parents:
4736
diff
changeset
|
2 |
abort: qdelete requires at least one revision or patch name |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
3 |
abort: cannot delete applied patch c |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8833
diff
changeset
|
4 |
popping c |
7627 | 5 |
now at: b |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
6 |
a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
7 |
b |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
8 |
a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 |
b |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
10 |
series |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
11 |
status |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8833
diff
changeset
|
12 |
popping b |
7627 | 13 |
now at: a |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
14 |
a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
15 |
b |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
16 |
series |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
17 |
status |
8833
14639c050251
mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8832
diff
changeset
|
18 |
patch a finalized without changeset message |
4722
487943b52a6c
mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents:
3376
diff
changeset
|
19 |
1 [mq]: a |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
20 |
0 base |
3376
b9a7c07fca0e
Update test-mq-qdelete to use qdel -r
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
21 |
abort: cannot delete revision 3 above applied patches |
8833
14639c050251
mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8832
diff
changeset
|
22 |
patch d finalized without changeset message |
14639c050251
mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8832
diff
changeset
|
23 |
patch e finalized without changeset message |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
24 |
f |
4722
487943b52a6c
mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents:
3376
diff
changeset
|
25 |
4 [mq]: f |
487943b52a6c
mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents:
3376
diff
changeset
|
26 |
3 [mq]: e |
487943b52a6c
mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents:
3376
diff
changeset
|
27 |
2 [mq]: d |
487943b52a6c
mq: regularize patch header creation.
Brendan Cully <brendan@kublai.com>
parents:
3376
diff
changeset
|
28 |
1 [mq]: a |
3088
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
29 |
0 base |
6645
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
30 |
adding base |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
31 |
abort: no revisions specified |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
32 |
no patches applied |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
33 |
abort: revision 0 is not managed |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
34 |
abort: cannot delete revision 2 above applied patches |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
8833
diff
changeset
|
35 |
popping c |
7627 | 36 |
now at: b |
6645
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
37 |
abort: unknown revision 'c'! |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
38 |
applying c |
7782
140429276b63
mq: handle empty patches more gracefully (issue1501)
Matt Mackall <mpm@selenic.com>
parents:
7627
diff
changeset
|
39 |
patch c is empty |
7627 | 40 |
now at: c |
8832
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7782
diff
changeset
|
41 |
patch a finalized without changeset message |
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7782
diff
changeset
|
42 |
patch b finalized without changeset message |
6645
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
43 |
c |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
44 |
3 imported patch c |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
45 |
2 [mq]: b |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
46 |
1 [mq]: a |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
47 |
0 base |
8832
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7782
diff
changeset
|
48 |
patch c finalized without changeset message |
6645
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
49 |
3 imported patch c |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
50 |
2 [mq]: b |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
51 |
1 [mq]: a |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
52 |
0 base |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
53 |
series |
37eedb1a1848
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4737
diff
changeset
|
54 |
status |