Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq-qdelete.out @ 3296:4546a5e31cb8
Use filelog.cmp in checkfilemerge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 20:18:59 -0500 |
parents | dc784839516d |
children | b9a7c07fca0e |
rev | line source |
---|---|
3085
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1 adding base |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
2 abort: cannot delete applied patch c |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
3 Now at: b |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
4 a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
5 b |
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 series |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 status |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
10 Now at: a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
11 a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
12 b |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
13 series |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
14 status |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
15 1 New patch: a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
16 0 base |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
17 abort: patch e not at base |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
18 f |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
19 4 New patch: f |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
20 3 New patch: e |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
21 2 New patch: d |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
22 1 New patch: a |
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
23 0 base |