Bug#545359: comment on bug #545359

[Malte Helmert]

In the meantime, the bug has been reported upstream by someone else:
https://bugzilla.gnome.org/show_bug.cgi?id=597631

For those like me who don't want to wait for the fix to be applied
upstream and make its way to Debian, a simple workaround is to change
/usr/lib/svn.py as follows:


--- svn.py.orig	2010-01-11 17:46:11.000000000 +0100
+++ /usr/lib/meld/vc/svn.py	2010-01-11 17:46:26.000000000 +0100
@@ -71,11 +71,13 @@
         matches = []

         re_status_moved = re.compile(r'^(A) +[+] +- +([?]) +[?] +([^
].*)$')
-        re_status_vc = re.compile(r'^(.) +\d+ +(\?|(?:\d+)) +[^ ]+ +([^
].*)$')
+        re_status_vc = re.compile(r'^(.) +\d+ +(\?|(?:\d+)) +[^/]+ +([^
].*)$')
         re_status_non_vc = re.compile(r'^([?]) +([^ ].*)$')
         re_status_tree_conflict = re.compile(r'^ +> +.*')




I hope that the mail client doesn't introduce spurious line wraps. In
any case, the change is to replace a space " " with a dash "/" in the
re_status_vc regexp.

This is not a proper fix -- e.g. it won't work if meld stops using
absolute paths, or if you have a username containing a slash. The
approach suggested upstream, using the --xml option, is better. But the
simple change above will at least fix the problem with current Debian or
Ubuntu meld if you have spaces in usernames but no slashes.