[Svnmerge] svnmerge and different flavors of sh

Blair Zajac blair at orcaware.com
Fri Sep 2 09:58:32 PDT 2005


Archie Cobbs wrote:
> Blair Zajac wrote:
> 
>>> Castellow, Robert wrote:
>>>
>>>> soegadm @ sogbst4--> ../svnmerge init -s -v -r 0-1503
>>>> svn://90.34.7.118/soeg/branches/R18.0/trunk
>>>>
>>>> ../svnmerge: syntax error at line 561: `;' unexpected
>>>
>>>
>>> Looks like there is some incompatibility on Solaris. These things
>>> are fixed as they come up. If you can figure out a patch that makes
>>> it work for you, I'll test it out for bash compatibility.
>>
>>
>> Maybe try something like this:
>> Index: svnmerge
>> ===================================================================
>> --- svnmerge    (revision 16027)
>> +++ svnmerge    (working copy)
>> @@ -558,7 +558,7 @@
>>  [ $? = 0 ] || usage
>>  set -- ${ARGS}
>>
>> -for i; do
>> +for i in $@; do
>>      case "$i" in
> 
> 
> Thanks.. I just committed a slightly modified version of this fix
> (using "$@" instead of plain $@).
> 
> -Archie

Great.  You may want to add an entry in

http://svn.collab.net/repos/svn/branches/1.2.x/STATUS

to get this fix into the next Subversion 1.2.4 release.

Regards,
Blair



More information about the Svnmerge mailing list