Anthony Ogier <aogier@iorga.com> (aogier)
r863104 | aogier | 2007-01-16 09:37:34 +0000 (Tue, 16 Jan 2007)
* contrib/client-side/svn-merge-vendor/svn-merge-vendor.py:
Adding my contribution : a tool to merge vendor branch, which automatically detects moves
r863145 | aogier | 2007-01-17 17:02:57 +0000 (Wed, 17 Jan 2007)
* trunk/contrib/client-side/svn-merge-vendor.py:
Moved from trunk/contrib/client-side/svn-merge-vendor/svn-merge-vendor.py
Adding the lxml website reference in order to download the lxml module
r864732 | aogier | 2007-04-19 16:57:42 +0000 (Thu, 19 Apr 2007)
* trunk/contrib/client-side/svn-merge-vendor.py:
Adding log support which replace all the old print >>sys.stderr
Correcting a bug which occured when the vendor made a new file which was then moved in an other path. Now the script detects the real origin of a moved file and check if the file is currently adding.
r865059 | aogier | 2007-05-10 11:50:54 +0000 (Thu, 10 May 2007)
* trunk/contrib/client-side/svn-merge-vendor.py:
Fix a log message (it was in a wrong order)
Now supporting the "replaced" and "normal" status of files
r867363 | aogier | 2007-10-19 08:17:06 +0000 (Fri, 19 Oct 2007)
* trunk/contrib/client-side/svn-merge-vendor.py:
Fix a int/string format problem while comparing the "from" and "to" revisions, thanks to Werner Schmitt