view tests/test-mq-qdelete.out @ 6297:fed1a9c22076

dirstate.remove: during merges, remember the previous file state

We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').

We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
Now at: b
a
b
a
b
series
status
Now at: a
a
b
series
status
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
f
4 [mq]: f
3 [mq]: e
2 [mq]: d
1 [mq]: a
0 base