[issue1136] exception when trying to import the following patch to trunk at http://hg.dpaste.com/django/trunk/

Faheem Mitha mercurial-bugs at selenic.com
Fri May 23 14:40:00 CDT 2008


New submission from Faheem Mitha <faheem at email.unc.edu>:

Current tip for http://hg.dpaste.com/django/trunk/ is

faheem at silkworm:/usr/local/src/django/django.patched$ hg tip
changeset:   5429:1f8d2cb6a14e
tag:         tip
user:        lukeplant
date:        Thu May 22 19:24:25 2008 +0000
summary:     Reverted mistaken r7545

When applying the attached patch, I get the following.

                                               Faheem.

*******************************************************
aheem at silkworm:/usr/local/src/django/django.patched$ hg import -p0
2070_revision7484.2.diff
applying 2070_revision7484.2.diff
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.0)
Traceback (most recent call last):
  File "/usr/bin/hg", line 20, in ?
    mercurial.dispatch.run()
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 29, in
dispatch
    return _runcatch(u, args)
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 45, in
_runcatch
    return _dispatch(ui, args)
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 364, in
_dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 417, in
_runcommand
    return checkargs()
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 373, in
checkargs
    return cmdfunc()
  File "/var/lib/python-support/python2.4/mercurial/dispatch.py", line 356, in
<lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File "/var/lib/python-support/python2.4/mercurial/commands.py", line 1555, in
import_
    files=files)
  File "/var/lib/python-support/python2.4/mercurial/patch.py", line 229, in patch
    return internalpatch(patchname, ui, strip, cwd, files)
  File "/var/lib/python-support/python2.4/mercurial/patch.py", line 292, in
internalpatch
    ret = applydiff(ui, fp, files, strip=strip)
  File "/var/lib/python-support/python2.4/mercurial/patch.py", line 1033, in
applydiff
    strip, reverse)
  File "/var/lib/python-support/python2.4/mercurial/patch.py", line 807, in
selectfile
    abase, afile = pathstrip(afile_orig, strip)
ValueError: too many values to unpack

----------
files: 2070_revision7484.2.diff
messages: 6082
nosy: faheem
priority: bug
status: unread
title: exception when trying to import the following patch to trunk at http://hg.dpaste.com/django/trunk/

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1136>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 2070_revision7484.2.diff
Type: application/octet-stream
Size: 101680 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080523/34735932/attachment.obj 


More information about the Mercurial-devel mailing list