Menu

#223 xx-svn-resolve conflicting with subversion's changelists

open
nobody
None
5
2012-04-12
2012-04-12
Anonymous
No

The script xx-svn-resolve doesn't work in combination with changelists in subversion.

I changed the script /usr/lib/pymodules/python2.7/xxdiff/scm/subversion.py as follows to make it work with changelists:

178a179,180
> if line.startswith('--- Changelist'):
> ignore = True

Discussion


Log in to post a comment.