[baseten-users] Merging branches

[Tuukka Norri]

Hi,
I just merged the latest testing branch back to trunk. I ran into a  
seemingly small problem:

asdf:baseten-trunk tsnorri$ svn merge --reintegrate http://basetenframework.org/svn/branches/BaseTen-connect-optimization/
svn: Retrieval of mergeinfo unsupported by 'http://basetenframework.org/svn'

So I merged the old way:

asdf:baseten-trunk tsnorri$ svn merge -r 938:HEAD http://basetenframework.org/svn/branches/BaseTen-connect-optimization/

Can someone see if this was completely alright or not so much? Thanks.
-- 
Best regards,
Tuukka