Did you do an "hg mv" rename on the patch file? What happens if you try creating both files (old and new) and then doing an "hg rm" on the one you don't want?
Steve On Mon, Oct 6, 2008 at 1:59 AM, Gabe Black <[EMAIL PROTECTED]> wrote: > I'm trying to commit my patch repository and push it up to daystrom > for safe keeping, as I do periodically, but mercurial is very upset > about something and won't let me. When I try to commit I get the following: > > [EMAIL PROTECTED] ~/m5/repos/m5.x86fs/.hg/patches $ hg commit > transaction abort! > rollback completed > ** unknown exception encountered, details follow > ** report bug details to http://www.selenic.com/mercurial/bts > ** or [EMAIL PROTECTED] > ** Mercurial Distributed SCM (version 1.0.1) > Traceback (most recent call last): > File "/usr/bin/hg", line 20, in <module> > mercurial.dispatch.run() > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 20, in run > sys.exit(dispatch(sys.argv[1:])) > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 29, in dispatch > return _runcatch(u, args) > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 45, in _runcatch > return _dispatch(ui, args) > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 364, in _dispatch > ret = _runcommand(ui, options, cmd, d) > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 417, in _runcommand > return checkargs() > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 373, in checkargs > return cmdfunc() > File "/usr/lib64/python2.5/site-packages/mercurial/dispatch.py", line > 356, in <lambda> > d = lambda: func(ui, repo, *args, **cmdoptions) > File "/usr/lib64/python2.5/site-packages/mercurial/commands.py", line > 557, in commit > node = cmdutil.commit(ui, repo, commitfunc, pats, opts) > File "/usr/lib64/python2.5/site-packages/mercurial/cmdutil.py", line > 1179, in commit > return commitfunc(ui, repo, files, message, match, opts) > File "/usr/lib64/python2.5/site-packages/mercurial/commands.py", line > 555, in commitfunc > force_editor=opts.get('force_editor')) > File "/usr/lib64/python2.5/site-packages/hgext/mq.py", line 2189, in > commit > return super(mqrepo, self).commit(*args, **opts) > File "/usr/lib64/python2.5/site-packages/mercurial/localrepo.py", line > 832, in commit > new[f] = self.filecommit(f, m1, m2, linkrev, trp, changed) > File "/usr/lib64/python2.5/site-packages/mercurial/localrepo.py", line > 712, in filecommit > meta["copyrev"] = hex(manifest1[cp]) > KeyError: 'stuckdebug.patch' > > > I added a "stuckdebug.patch" patch which originally was just for debug > hacks I was going to take out later, but ended up as a bunch of DPRINTFs > I wanted to keep. I renamed it to something else which is why I think > mercurial is confused. I tried renaming it back, but no matter what it's > called, mercurial complains about the other one. I've tried adding in a > new patch called stuckdebug.patch to try to placate it, but that didn't > work either. I'd really prefer to do this with as little fuss as > possible since I've got about 85 patches in there which I would hate to > lose some how. > > Gabe > _______________________________________________ > m5-dev mailing list > m5-dev@m5sim.org > http://m5sim.org/mailman/listinfo/m5-dev >
_______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
