view tests/test-mq-qdelete.out @ 9750:f153af9580fe

merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Nov 2009 14:07:45 -0600
parents 561ff8d9e4f0
children
line wrap: on
line source

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
popping c
now at: b
a
b
a
b
series
status
popping b
now at: a
a
b
series
status
patch a finalized without changeset message
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
patch d finalized without changeset message
patch e finalized without changeset message
f
4 [mq]: f
3 [mq]: e
2 [mq]: d
1 [mq]: a
0 base
adding base
abort: no revisions specified
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
popping c
now at: b
abort: unknown revision 'c'!
applying c
patch c is empty
now at: c
patch a finalized without changeset message
patch b finalized without changeset message
c
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
patch c finalized without changeset message
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
series
status