Hi list
I have recieved the following exception upon merging using "hgtk ci" with a
file that should be resolved. The bug report dialog shows up after I closed
the main dialog, but I suspect it happened after commit followed by refresh.
Traceback (most recent call last):
File "E:\src\mercurial\thg\branch-view\tortoisehg\hgtk\status.py", line
932, in tree_sel_changed
buf = self.generate_text_diffs(row)
File "E:\src\mercurial\thg\branch-view\tortoisehg\hgtk\status.py", line
1000, in generate_text_diffs
for s in patch.diff(self.repo, pctxs[1].node(), None,
IndexError: list index out of range
A peek at the code in status.py made me suspect line 206 in get_body(self)
self.merging = (self.count_revs() < 2
and len(self.repo.parents()) == 2)
As far as I could tell get_body is called only once during construction, so
when the merge has been committed, the flag self.merging is not updated to
False.
Regards,
Peer
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop