[issue933] mq: qrefresh looses files already in patch

[Kirill Smelkov]

New submission from Kirill Smelkov <kirr at landau.phys.spbu.ru>:

kirr at tugrik2:~/tmp/trashme/qrefresh-bug$ hg init a
kirr at tugrik2:~/tmp/trashme/qrefresh-bug$ cd a/
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ echo 1 > 1.txt
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ echo 2 > 2.txt
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg add 1.txt 2.txt 
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg ci -m init
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg st
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg log
changeset:   0:5ee6ec9f9bc6
tag:         tip
user:        Kirill Smelkov <kirr at mns.spb.ru>
date:        Fri Jan 18 19:10:56 2008 +0300
summary:     init

kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ echo 11 >> 1.txt 
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ echo 22 >> 2.txt 
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg qnew -f xx.patch
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg diff
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ echo 222 >> 2.txt
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg diff
diff --git a/2.txt b/2.txt
--- a/2.txt
+++ b/2.txt
@@ -1,2 +1,3 @@ 2
 2
 22
+222
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg qdiff
diff --git a/1.txt b/1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,1 +1,2 @@
 1
+11
diff --git a/2.txt b/2.txt
--- a/2.txt
+++ b/2.txt
@@ -1,1 +1,3 @@
 2
+22
+222
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg qrefresh 2.txt 
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg st
M 1.txt
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg diff
diff --git a/1.txt b/1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,1 +1,2 @@ 1
 1
+11
kirr at tugrik2:~/tmp/trashme/qrefresh-bug/a$ hg qdiff
diff --git a/1.txt b/1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,1 +1,2 @@
 1
+11
diff --git a/2.txt b/2.txt
--- a/2.txt
+++ b/2.txt
@@ -1,1 +1,3 @@
 2
+22
+222

----

*** OOPS, 1.txt got out of xx.patch!??? ***

----------
messages: 4906
nosy: kirr
priority: bug
status: unread
title: mq: qrefresh looses files already in patch
topic: mq

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