Question

我在我的根目录上做了一个反复的sed，当我尝试提交，或者除了hg --help之外用hg做任何事情，我得到一个堆栈跟踪。我错误地认为当我执行sed时.hg目录被写保护。

回购邮件是我的机器本地的。

我有什么方法可以恢复我的更改日志或提交评论吗？我在00changelog.i目录中找到了一个名为.hg的文件，但它是一个不执行的二进制文件。

sed命令：

find . -type f -exec sed -i.bak "s/sim-config.h/config.h/g" {} \;
find . -type f -exec sed -i.bak "s/av-config.h/config.h/g" {} \;

堆栈跟踪：

Traceback (most recent call last):
  File "/usr/bin/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 30, in dispatch
    return _runcatch(u, args)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 50, in _runcatch
    return _dispatch(ui, args)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 470, in _dispatch
    return runcommand(lui, repo, cmd, fullargs, ui, options, d)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 340, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 521, in _runcommand
    return checkargs()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 475, in checkargs
return cmdfunc()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 469, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.6/site-packages/mercurial/util.py", line 401, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.6/site-packages/mercurial/commands.py", line 712, in commit
    node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
  File "/usr/lib/python2.6/site-packages/mercurial/cmdutil.py", line 1151, in commit
    return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
  File "/usr/lib/python2.6/site-packages/mercurial/commands.py", line 710, in commitfunc
    editor=e, extra=extra)
  File "/usr/lib/python2.6/site-packages/mercurial/localrepo.py", line 787, in commit
    changes = self.status(match=match, clean=force)
  File "/usr/lib/python2.6/site-packages/mercurial/localrepo.py", line 1015, in status
    listclean, listunknown)
  File "/usr/lib/python2.6/site-packages/mercurial/dirstate.py", line 614, in status
    dmap = self._map
  File "/usr/lib/python2.6/site-packages/mercurial/util.py", line 156, in __get__
    result = self.func(obj)
  File "/usr/lib/python2.6/site-packages/mercurial/dirstate.py", line 58, in _map
    self._read()
  File "/usr/lib/python2.6/site-packages/mercurial/dirstate.py", line 228, in _read
    p = parsers.parse_dirstate(self._map, self._copymap, st)

Answer 1

如果您没有可以替换.hg克隆的上游源，则可能取决于文件的严重程度。但是，正如您所注意到的，Mercurial在内部以二进制格式存储文件，这将使手动修复变得更加困难。

据推测，您没有使用sed -i.bak与备份进行就地操作（这样可以轻松恢复）。

您可以执行以下操作：

find .hg -mmin -60 -print

查看过去（比如说）60分钟内修改了哪些文件。可能没有太多被修改，你可以找到一些方法来反转sed命令对该文件的影响（但如果你运行像/foo/d这样的话就不可能。）

对于未来，可能值得注册http://bitbucket.org/上的免费帐户，这将为您提供免费的私人存储库托管和良好的备份位置。

破碎的Mercurial回购

1 个答案: