[Bug 4366] New: deadlock when creating new patch upon histedit

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Thu Sep 11 12:34:49 UTC 2014


http://bz.selenic.com/show_bug.cgi?id=4366

          Priority: normal
            Bug ID: 4366
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: deadlock when creating new patch upon histedit
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: cwidmer at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.1.1
         Component: mq
           Product: Mercurial

i ended up in a kinda deadlock situation. i just had committed to much in my
last commit and wanted to pull some changes out of it (split my last commit). i
tried this by 


what i did

a) hg histedit tip
b) choose to edit last commit
c) hg qnew stage -i
as shelve does not provide an interactive mode i wanted to put some changes
away 

form this point on i could not move anymore
- hg histedit --continue complains about an applied mq patch
- hg qpop complains about histedit being in process

might be that this is all correct but then 'hg qnew' should already had failed.

how to reproduce

> hg init
> touch file1 file2 
> hg commit -m'add files' -A
> echo abc > file1 
> echo abc > file2
> hg commit -m'add content'
> hg histedit 1
> hg qnew stage file1

> hg histedit -c
abort: source has mq patches applied

> hg qpop
abort: histedit in progress

-- 
You are receiving this mail because:
You are on the CC list for the bug.



More information about the Mercurial-devel mailing list