[arch-dev-public] subversion issues- we need to fix our scripts

[Aaron Griffin]

On Tue, Jun 2, 2009 at 7:21 AM, Dan McGee<dpmcgee at gmail.com> wrote:
> On Mon, Jun 1, 2009 at 11:48 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
>> On Mon, Jun 1, 2009 at 10:42 PM, Dan McGee <dpmcgee at gmail.com> wrote:
>>> Committed revision 40987.
>>> ~/projects/arch-repos/licenses/repos/testing-i686
>>> ~/projects/arch-repos/licenses ~/projects/arch-repos/licenses/trunk
>>> /usr/bin/archrelease: line 24: svnmerge: command not found
>>> svn: Can't open file 'svnmerge-commit-message.txt': No such file or directory
>>> rm: cannot remove `svnmerge-commit-message.txt': No such file or directory
>>> ~/projects/arch-repos/licenses ~/projects/arch-repos/licenses/trunk
>>> ~/projects/arch-repos/licenses/trunk
>>> ===> Tagged for testing-i686
>>>
>>> subversion 1.6.2-4 doesn't contain the svnmerge script (at least on
>>> i686). subversion 1.6.2-3 on x86_64 does, but this is going to cause
>>> some problems.
>>>
>>> -Dan
>>>
>>
>> AFAIK, the problem is with subversion. there's a bug report for that.
>
> I probably should have looking into that a bit more, I did see traffic
> going around dealing with problems building subversion in a chroot,
> etc.
>
> However, we really shouldn't be using svnmerge anymore- "svn merge"
> has been a first class operation in subversion since 1.5.0, and
> svnmerge was simply a pre-1.5 script to perform that action. Does
> anyone want to take a crack at updating these?

I'd recommend trying a  s/svnmerge/svn merge/ locally and see how it goes.

If we need to re-run the merge-init stuff, I can do that on the server side