[issue1179] qpush -f merge local changes instead of discarding them

[Patrick Mézard]

New submission from Patrick Mézard <pmezard at gmail.com>:

$ hg init t
$ cd t
$ echo a > a
$ hg ci -Am t
adding a
$ echo b >> a
$ hg qnew -f changea
$ hg qpop
Patch queue now empty
$ echo c >> a
$ hg st
M a
$ hg qpush -f
applying changea
Now at: changea
$ cat a
a
b
c
$ hg st

----------
messages: 6283
nosy: pmezard
priority: urgent
status: unread
title: qpush -f merge local changes instead of discarding them
topic: mq

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1179>
____________________________________________________