[arch-dev-public] archrelease: svnmerge

[Allan McRae]

On 11/02/10 23:39, Dan McGee wrote:
> On Thu, Feb 11, 2010 at 6:53 AM, Thomas Bächler<thomas at archlinux.org>  wrote:
>> Am 11.02.2010 13:10, schrieb Pierre Schmitz:
>>> Hi all,
>>>
>>> while having a little review of our devtools I noticed the we use svnmerge in
>>> archrelease to merge changes from trunk into the repo dir. This is very
>>> expensive and sometimes fails for more or less known reasons.
>>>
>>> So, I wonder why we don't just do something like this:
>>>
>>>        svn rm repos/extra-i686
>>>        svn cp trunk repos/extra-i686
>>>
>>> I did not check if this would requrie a commit after the rm or if we could do
>>> it in one run. But it should be a lot faster and safer though.
>>
>> We agreed a while back that we should do what you propose: We don't
>> actually want the repos/ stuff to be merged with trunk, but be exact
>> snapshots (tags) of trunk.
>
> +1 to this.

Agree.  Merge fails often enough that I end up doing that anyway...

Allan