Re: Current trunk broken for mercurial

[Edwin Vane <revane gmail com>]

Oh, and btw, my mercurial patching problem seems to have been fixed. Thanks Vincent.

On Wed, Mar 18, 2009 at 9:36 AM, Edwin Vane <revane gmail com> wrote:

I now have a local patch where I basically change 'glib' to 'gobject' in tree.py. Meld runs fine now.

On Wed, Mar 18, 2009 at 9:34 AM, Edwin Vane <revane gmail com> wrote:

Looking into it a bit more, this function belongs to the gobject module, not glib. At least this is the case with Ubuntu 8.04 (the python-gobject package). I see in the gtk docs that markup_escape_text() is defined as belonging to 'glib' but that doesn't seem to be the case in my environment...

On Wed, Mar 18, 2009 at 9:11 AM, Edwin Vane <revane gmail com> wrote:

Yes, svn blame tells me that r1260 introduced the dependency on glib.

Google is not being very helpful. Where does one get this module? What package does it belong to?

On Wed, Mar 18, 2009 at 9:08 AM, Edwin Vane <revane gmail com> wrote:

Hi,

So I updated to r1269, and did:
make uninstall
make clean
make install

And now when I run meld from the command line I get:
Traceback (most recent call last):
  File "/usr/local/bin/meld", line 76, in <module>
    import meldapp
  File "/usr/local/lib/meld/meldapp.py", line 36, in <module>
    import vcview
  File "/usr/local/lib/meld/vcview.py", line 24, in <module>
    import tree
  File "/usr/local/lib/meld/tree.py", line 18, in <module>
    import glib
ImportError: No module named glib

Since I didn't get this before I'm guessing there's a new dependency?

On Tue, Mar 17, 2009 at 7:18 PM, Vincent Legoll <vincent legoll gmail com> wrote:

Hello,

I think I was to blame for the breakage, I bissected a bug
(diffing a file not in a VC's root dir was broken) back to my
patches in r1209-r1211, which I reverted, and then tested
Andrew Beyer's fix for Bug 414365 instead which was
working great.

So, r1209-r1211 are reverted by r1267, and Andrew's fix
is in r1268.

Sorry for the mess, I wasn't testing my patches enough.
Hope this is fixed for good now.

--
Vincent Legoll

--
Edwin V

--
Edwin V

--
Edwin V

--
Edwin V

-- 
Edwin V