On 7 June 2013 04:59, Chuck Tuffli <[email protected]> wrote: > Hi - > > I'm running into a repeatable issue with the version of meld from > https://git.gnome.org/browse/meld, and wanted to run the scenario by you > guys to see if perhaps I'm doing something silly or possibly using > incompatible revisions of the various tools. > > The short version is, if there are changes to two files, each in a different > sub-directory, meld correctly displays the first set of changes, but it hits > an error when displaying the second set of changes: > > Traceback (most recent call last): > File "/home/ctuffli/app/meld.git/meld/vcview.py", line 579, in > on_row_activated > self.run_diff( [path] ) > File "/home/ctuffli/app/meld.git/meld/vcview.py", line 616, in run_diff > [], [(os.path.basename(path), path)])[1][0] > IndexError: list index out of range > > I instrumented the code a little and can see that after displaying the first > set of changes, the SVN tree cache changes. Below is a capture of my console > session. You'll notice that the meld output includes a couple of new > pretty-print statements in the _get_dirsandfiles() method of svn.py of the > tree and directory. <snip>
Thanks, that was very helpful. The bug was introduced by changes required for the conflict resolution support for SVN... I didn't realise how intertwined some of our caching was. I've pushed a patch that fixes this for me, and hopefully doesn't have any other side effects, so let me know if you have any problems with current git. cheers, Kai _______________________________________________ meld-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/meld-list
