Receiving error 'Error string "%(arg0)s" at %(arg1)s Please edit your config'

Issue #2490 closed
Christopher Allen-Poole
created an issue

I had a conflict and attempted to see a diff to the local revision and I received the above error. (I then repeated the process for the ancestor from the repo, and got the same issue)

Not only is that error not specific enough, but it would not let me click on the edit button.

   #!python
    ** Mercurial version (2.4.2+20130203).  TortoiseHg version (2.7)
    ** Command: --nofork synch
    ** CWD: C:\Projects\CHCF\CHLIHBRedesign\chlihb
    ** Encoding: cp1252
    ** Extensions loaded: 
    ** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
    ** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
    ** Processor architecture: x64
    ** Qt-4.8.4 PyQt-4.9.6 QScintilla-2.7
    Traceback (most recent call last):
      File "tortoisehg\hgqt\resolve.pyo", line 327, in diffLocToAnc
      File "tortoisehg\hgqt\visdiff.pyo", line 194, in visualdiff
      File "mercurial\scmutil.pyo", line 602, in revpair
      File "mercurial\scmutil.pyo", line 666, in revrange
      File "mercurial\revset.pyo", line 1793, in mfunc
      File "mercurial\revset.pyo", line 197, in getset
      File "mercurial\revset.pyo", line 247, in dagrange
      File "mercurial\revset.pyo", line 197, in getset
      File "mercurial\revset.pyo", line 270, in func
      File "mercurial\revset.pyo", line 294, in ancestor
    ParseError: ancestor arguments must be single revisions

Comments (5)

  1. Steve Borho

    It's this revision set that is throwing the ParseError:

    ancestor(p1(),p2())..p2()

    How are p1() and p2() not single revisions?

    What operation caused the merge conflicts? An update, merge, rebase, graft?

  2. Log in to comment