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.

adding base
abort: cannot delete applied patch c
Now at: b
a
b
a
b
series
status
Now at: a
a
b
series
status
1 New patch: a
0 base
abort: cannot delete revision 3 above applied patches
f
4 New patch: f
3 New patch: e
2 New patch: d
1 New patch: a
0 base