Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qdelete.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 3374 b9a7c07fca0e
child 4722 487943b52a6c
permissions -rw-r--r--
Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
3374
b9a7c07fca0e Update test-mq-qdelete to use qdel -r
Brendan Cully <brendan@kublai.com>
parents: 3085
diff changeset 
    17
 
abort: cannot delete revision 3 above applied patches
3085
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
mercurial-crew-with-dirclash