Patchwork [Bug,4458] New: Inconsistencies in mq patch queue vs what working directory shows

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date Nov. 18, 2014, 6:57 p.m.
Message ID <bug-4458-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/6771/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - Nov. 18, 2014, 6:57 p.m.
http://bz.selenic.com/show_bug.cgi?id=4458

          Priority: normal
            Bug ID: 4458
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: Inconsistencies in mq patch queue vs what working
                    directory shows
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: faheem@faheem.info
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.1
         Component: mq
           Product: Mercurial

The following script causes weirdness. Possibly another manifestation of the
infamous linkrev bug.

hg init mq-test
hg init --mq mq-test
cd mq-test
echo foo1 > foo1
hg add foo1
hg qnew test
hg ci --mq -m "add foo1"
echo foo2 > foo2
hg add foo2
hg qref
hg ci --mq -m "add foo2"
hg rm foo1
hg mv foo2 foo1
hg forget foo2
hg revert foo2
hg revert foo1

faheem@orwell:~/mqtestnew/mq-test$ hg st foo1
? foo1
faheem@orwell:~/mqtestnew/mq-test$ hg log foo1
changeset:   0:d05e48dbd1d2
tag:         qbase
tag:         qtip
tag:         test
tag:         tip
user:        Faheem Mitha <faheem@faheem.info>
date:        Tue Nov 18 23:46:28 2014 +0530
summary:     [mq]: test

faheem@orwell:~/mqtestnew/mq-test$ cat .hg/patches/test 
# HG changeset patch
# Parent  0000000000000000000000000000000000000000


faheem@orwell:~/mqtestnew/mq-test$ cat foo1
foo2
faheem@orwell:~/mqtestnew/mq-test$ cat foo2
foo2

Patch

diff -r 000000000000 foo1
--- /dev/null
+++ b/foo1
@@ -0,0 +1,1 @@ 
+foo1
diff -r 000000000000 foo2
--- /dev/null
+++ b/foo2
@@ -0,0 +1,1 @@ 
+foo2