1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #2545 resolved

Exception during rebase

Vedran Miletić
created an issue
    #!python
    ** Mercurial version (2.6-rc+6-d78d0256198e).  TortoiseHg version (2.7.2+35-a9df15d891bf)
    ** Command: 
    ** CWD: /home/djurdjica
    ** Encoding: UTF-8
    ** Extensions loaded: churn, extdiff, fetch, histedit, rebase, convert, mq, hgk
    ** Python version: 2.7.4 (default, Apr 19 2013, 18:32:33) [GCC 4.7.3]
    ** System: Linux mamin-komp 3.8.0-19-generic #29-Ubuntu SMP Wed Apr 17 18:19:42 UTC 2013 i686
    ** Qt-4.8.4 PyQt-4.10 QScintilla-2.7.1
    Traceback (most recent call last):
      File "/home/djurdjica/bin/thg/tortoisehg/hgqt/thread.py", line 273, in run
        self.ret = hglib.dispatch(ui, self.cmdline) or 0
      File "/home/djurdjica/bin/thg/tortoisehg/util/hglib.py", line 826, in dispatch
        return hgdispatch._dispatch(req)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 747, in _dispatch
        cmdpats, cmdoptions)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 516, in runcommand
        ret = _runcommand(ui, options, cmd, d)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 842, in _runcommand
        return checkargs()
      File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 813, in checkargs
        return cmdfunc()
      File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 742, in <lambda>
        d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
        return func(*args, **kwargs)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/extensions.py", line 143, in wrap
        util.checksignature(origfn), *args, **kwargs)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
        return func(*args, **kwargs)
      File "/usr/local/lib/python2.7/dist-packages/hgext/mq.py", line 3528, in mqcommand
        return orig(ui, repo, *args, **kwargs)
      File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 506, in check
        return func(*args, **kwargs)
      File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 273, in rebase
        _('unresolved conflicts (see hg '
    InterventionRequired: unresolved conflicts (see hg resolve, then hg rebase --continue)

Comments (2)

  1. Log in to comment