[issue1405] "unknown exception encountered" when qfolding multiple patches together, where later patch removes file edited by earlier patch

Daniel Holbert mercurial-bugs at selenic.com
Mon Dec 1 20:31:15 CST 2008


New submission from Daniel Holbert <dholbert at mozilla.com>:

STEPS TO REPRODUCE:
-------------------
Just run the commands in the attached "qfold_broken.sh" script

The commands basically just do this:
   a. Clone http://hg.mozilla.org/mozilla-central
   b. Clone my patch queue
http://hg.mozilla.org/users/dholbert_mozilla.com/smil-patches
   c. "hg qnew" a new patch, and try to fold the first 4 patches (up to
"smil_secondFixes") into it.

ACTUAL RESULTS:
---------------
The "qfold" command fails with an "unknown exception encountered" error message,
and it leaves my source tree in an unclean state, with 'hg qpop' and 'hg status'
both failing.  (details to follow)

NOTE: If, instead of qfolding the 4 patches all at once, I qfold the first 3 and
*then* separately qfold the 4th one, then everything works fine.  (I'll attach a
separate script demonstrating that.)

I think this might happen because the 4th patch deletes files which are created
in the 1st patch (and which are modified in the 2nd and 3rd patches).  So, I'm
guessing the problem is that Mercurial has a hard time when it needs to create &
delete a file in a single qfold command.

Mercurial version: 1.0.1
OS Version: Ubuntu 8.10 (up to date)

----------
files: qfold_broken.sh
messages: 8038
nosy: dholbert
priority: urgent
status: unread
title: "unknown exception encountered" when qfolding multiple patches together, where later patch removes file edited by earlier patch

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1405>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: qfold_broken.sh
Type: application/x-sh
Size: 556 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20081202/41b5ea49/attachment.sh 


More information about the Mercurial-devel mailing list