On Wed, Jun 10, 2009 at 8:44 AM, Georg<gwk....@googlemail.com> wrote:
> Hi,
>
> just in case you didn't know this one yet, I get this stack trace after a
> successful hgtk merge:
>
> {{{
> ** Please report this bug to tortoisehg-discuss@lists.sourceforge.net or
> http://bitbucket.org/tortoisehg/stable/issues
> ** Mercurial version (1.2.1). TortoiseHg version (unknown)
> ** Command: merge -r v14
> ** CWD: /home/hunter/gwk/hg.SimManager-v14
> ** Extensions loaded: children, color, graphlog, graphviz, bookmarks,
> extdiff, hgk, hgview, interhg, mq, patchbomb, rebase, transplant
> Recoverable runtime error (stderr):
> Traceback (most recent call last):
> File
> "/home/hunter/gwk/Desktop/repositories/tortoisehg-crew/hggtk/status.py",
> line 862, in merge_sel_changed
> for s in patch.diff(self.repo, pctxs[1].node(), None,
> IndexError: list index out of range
>
> }}}
>
> I'm running THG e4958f6dd6cb, on Ubuntu Linux.
Ah, there's no longer two parents after the merge commit.. but I'm
curious why there were any files to diff after the merge commit. Was
that done on purpose?
--
Steve Borho
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Tortoisehg-discuss mailing list
Tortoisehg-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
