[Building Sakai] svn merge across repositories

[Matthew Buckett]

On 27 July 2010 20:02, John Bush <john.bush at rsmart.com> wrote:
>
> see http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html

contains the text:

Merging from foreign repositories
While it's possible to run a command such as svn merge -r 100:200
http://svn.foreignproject.com/repos/trunk, the resultant patch will
also lack any historical merge metadata. At time of this writing,
Subversion has no way of representing different repository URLs within
the svn:mergeinfo property.

So if you merge in changes from a vendor branch and merge any
conflicts you don't get any merge info in the repository about which
revisions were merged so next time you merge in the vendor branch you
have to make sure you don't merge in the same changes again (which
would conflict).

If you're using mSub then you shouldn't have this problem as SVN will
track which revisions have been merged in (assuming a client of 1.5+

http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.mergeinfo

-- 
  Matthew Buckett
  VLE Developer, LTG, Oxford University Computing Services