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

Mattias Engdegård <mattias@virtutech.se> wrote:

>> 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.
>
> (s/mv/cp/ I presume)
>
> Branches may also be created by WC->URL copies, which allows changes
> to be done at the same time. It does not have to be trash.

Yes that's right. I was just describing what situation prompted my fix.
svnmerge should now behave fine also in the scenario you describe.

Giovanni Bajo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 5 10:38:01 2006