[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r23030 - in trunk: . contrib/client-side/svn-merge-vendor

From: Blair Zajac <blair_at_orcaware.com>
Date: 2007-01-16 20:30:25 CET

aogier@tigris.org wrote:
> Author: aogier
> Date: Tue Jan 16 01:37:34 2007
> New Revision: 23030
> Log:
> Adding my contribution : svn-merge-vendor.py, a tool to merge vendor branch, which automatically detects moves
> Added:
> trunk/contrib/client-side/svn-merge-vendor/
> trunk/contrib/client-side/svn-merge-vendor/svn-merge-vendor.py
> Modified:

Hi Anthony,

Thanks for contributing this.

A couple of things:

1) I fixed the end of line issue where the file had the Windows CRLF line
endings committed. See the last two commits I did to this file.

2) Is there a reason why this script is in its own directory, since there's only
one file. Can you move it up a level using 'svn mv' and delete the subdirectory?

3) I cannot run the script since it's looking for the lxml module? Could you
provide in the file where to get this module from?

Actually, even better, would be to switch the code over to the elementtree XML
parsing module which is now standard in Python 2.5 and is available for Python
2.1 and greater? This will make it more easily usable in the future, since I
don't have to install another set of XML bindings.


Blair Zajac, Ph.D.
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jan 16 20:30:41 2007

This is an archived mail posted to the Subversion Dev mailing list.