Hi (again), I tried various available versions of helper scripts but all of them fail with the same error code when I invoke meld during the svn merge operation. I would like to see ANY meld user post his working helper script here, so I can narrow down the problem.
Thanks. -Sandip On Sun, Nov 27, 2011 at 11:53 PM, sandip gangakhedkar <[email protected] > wrote: > Hi, > > I am using meld v1.5.0 with sven v1.6.17 on Ubuntu 11.04. I have the > following script (meld-svn.sh) in my .subversion/config file: > > > > #!/usr/bin/env python > # svn merge-tool python wrapper for meld > import sys > import subprocess > > # path to meld ($ which meld) > meld = "/usr/bin/meld" > log = False > f = open('/tmp/svn-merge-meld.log', 'a') > > def main(): > if log: > f.write("call: %r\n" % sys.argv) > > # file paths > base = sys.argv[1] > theirs = sys.argv[2] > mine = sys.argv[3] > merged = sys.argv[4] > partial = sys.argv[5] > > # the call to meld > cmd = [meld, mine, base, theirs, merged] > > # Call meld, making sure it exits correctly > subprocess.check_call(cmd) > > try: > main() > except Exception as e: > print "Oh noes, an error: %r" % e > if log: > f.write("Error: %r\n" % e) > sys.exit(-1) > > > But when I invoke meld during the svn merge, I get an error: > > The external merge tool exited with exit code 255 > > Would appreciate any help to get this working. > > Thanks. > > -- > *-*Sandip*-* > > -- *-*Sandip*-*
_______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
