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

[PATH, svnmerge] Fix "svnmerge init" on the GCC repository branches

From: Giovanni Bajo <rasky_at_develer.com>
Date: 2006-02-04 16:24:10 CET

Hello,

the regular expression used to parse the XML produced by "svn log" was a
little too optimistic: it basically assumed that no other files but the
branch itself where being added in the commit that creates a branch. This
was actually a sound assumption (as usually branches are created with "svn
mv URL URL", so nothing else is changed in that commit), but it's broken by
the GCC repository (generated by cvs2svn) which contains some spurious
(wrong) trash in the commits that generate the branches.

This fix lets "svnmerge init" succeed also within the GCC repository. Now,
if ElementTree was part of the standard core, this piece of regexp would be
gone already, but I'm too lazy to use SAX when a regexp (somehow) suffices.
For now at least...

Committed as r18341.

[[[
Fix the regular expression used to parse the XML produced by "svn log" to
extract the copy-from information: it was too broad and was allowing
spurious
matches (eg. when used on the GCC repository).

* contrib/client-side/svnmerge.py:
  (get_copyfrom): Make the regexp more strict.
]]]

-- 
Giovanni Bajo


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sat Feb 4 16:24:47 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.