[issue1662] hg qfold folds pending modifications

[Derek Yang]

New submission from Derek Yang <yanghada at gmail.com>:

I am seeing a weird behavior in hg qfold. 

In summary, when I use hg qfold to fold a patch 2.patch into the current top
patch 1.patch, hg folds everything from 2.patch into 1.patch (this is correct).
 But the issue that i am seeing is,  if there are any pending modifications in
my working directory, hg will also folds them into 1.patch.  This is not what I
expect. 

Some steps to reproduce this issue:

hg init
echo 'version 1' > file
hg add
hg qnew -m "version 1" -f 1.patch

echo 'version 2' >> file
hg qnew -m "version 2" -f 2.patch

hg qpop
hg qtop
// 1.patch is the top applied patch

echo 'version 3' >> file

hg qfold 2.patch

cat file
// version1
// version2
// version3

What I expect to see is:

cat file
// version1
// version2

----------
messages: 9323
nosy: dyang
priority: bug
status: unread
title: hg qfold folds pending modifications
topic: patch

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