[Bug 3989] New: abort: untracked files in working directory differ from files in requested revision

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Thu Jul 18 13:03:53 CDT 2013 

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

          Priority: normal
            Bug ID: 3989
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: abort: untracked files in working directory differ
                    from files in requested revision
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: visseraj at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: rebase
           Product: Mercurial

I got this error when doing a pull --rebase

$ hg pull --rebase 
pulling from <removed>
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 20 changes to 20 files
nothing to rebase
public/m/img/logo_144_144.png: untracked file differs
abort: untracked files in working directory differ from files in requested
revision

I then removed the offending file and tried again

$ rm public/m/img/logo_144_144.png

$ hg pull --rebase 
pulling from <removed>
searching for changes
no changes found

$ hg in
comparing with <removed>
searching for changes
no changes found

$ hg update 
** unknown exception encountered, please report by visiting
** http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.3 (default, Apr 10 2013, 06:20:15) [GCC 4.6.3]
** Mercurial Distributed SCM (version 2.6.1)
** Extensions loaded: convert, hgk, extdiff, rebase, churn, graphlog, mq
Traceback (most recent call last):
  File "/usr/bin/hg", line 38, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 28, in
run
    sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 65, in
dispatch
    return _runcatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, in
_runcatch
    return _dispatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 771, in
_dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 540, in
runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 866, in
_runcommand
    return checkargs()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 837, in
checkargs
    return cmdfunc()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 766, in
<lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 143, in
wrap
    util.checksignature(origfn), *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3528, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 5813, in
update
    ret = hg.update(repo, rev)
  File "/usr/lib/python2.7/dist-packages/mercurial/hg.py", line 463, in update
    stats = updaterepo(repo, node, False)
  File "/usr/lib/python2.7/dist-packages/mercurial/hg.py", line 459, in
updaterepo
    return mergemod.update(repo, node, False, overwrite, None)
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 748, in
update
    stats = applyupdates(repo, actions, wc, p2, pa, overwrite)
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 493, in
applyupdates
    for i, item in prog:
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 414, in
getremove
    wwrite(f, fctx(f).data(), arg[2][0])
  File "/usr/lib/python2.7/dist-packages/mercurial/localrepo.py", line 794, in
wwrite
    self.wopener.symlink(data, filename)
  File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 374, in
symlink
    os.symlink(src, linkname)
TypeError: must be encoded string without NULL bytes, not str
Error in sys.excepthook:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/apport_python_hook.py", line 66, in
apport_excepthook
    from apport.fileutils import likely_packaged, get_recent_crashes
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 95,
in _demandimport
    return _import(name, globals, locals, fromlist, level)
  File "/usr/lib/python2.7/dist-packages/apport/__init__.py", line 1, in
<module>
    from apport.report import Report
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 114,
in _demandimport
    mod = _origimport(name, globals, locals)
  File "/usr/lib/python2.7/dist-packages/apport/report.py", line 155, in
<module>
    class Report(problem_report.ProblemReport):
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 86,
in __getattribute__
    self._load()
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 58,
in _load
    mod = _origimport(head, globals, locals)
  File "/usr/lib/python2.7/dist-packages/problem_report.py", line 93, in
<module>
    class ProblemReport(UserDict):
TypeError: Error when calling the metaclass bases
    module.__init__() takes at most 2 arguments (3 given)

Original exception was:
Traceback (most recent call last):
  File "/usr/bin/hg", line 38, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 28, in
run
    sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 65, in
dispatch
    return _runcatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, in
_runcatch
    return _dispatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 771, in
_dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 540, in
runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 866, in
_runcommand
    return checkargs()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 837, in
checkargs
    return cmdfunc()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 766, in
<lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 143, in
wrap
    util.checksignature(origfn), *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3528, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 5813, in
update
    ret = hg.update(repo, rev)
  File "/usr/lib/python2.7/dist-packages/mercurial/hg.py", line 463, in update
    stats = updaterepo(repo, node, False)
  File "/usr/lib/python2.7/dist-packages/mercurial/hg.py", line 459, in
updaterepo
    return mergemod.update(repo, node, False, overwrite, None)
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 748, in
update
    stats = applyupdates(repo, actions, wc, p2, pa, overwrite)
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 493, in
applyupdates
    for i, item in prog:
  File "/usr/lib/python2.7/dist-packages/mercurial/merge.py", line 414, in
getremove
    wwrite(f, fctx(f).data(), arg[2][0])
  File "/usr/lib/python2.7/dist-packages/mercurial/localrepo.py", line 794, in
wwrite
    self.wopener.symlink(data, filename)
  File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 374, in
symlink
    os.symlink(src, linkname)
TypeError: must be encoded string without NULL bytes, not str

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

More information about the Mercurial-devel mailing list