Anthony Ogier <aogier@iorga.com> (aogier)


Patch
r867363, r865059, r864732, r863145, r863104

r867363 | aogier | 2007-10-19 03:17:06 -0500 (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

r865059 | aogier | 2007-05-10 06:50:54 -0500 (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

r864732 | aogier | 2007-04-19 11:57:42 -0500 (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.

r863145 | aogier | 2007-01-17 11:02:57 -0600 (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

r863104 | aogier | 2007-01-16 03:37:34 -0600 (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