[Svnmerge] Merging for foriegn repositories

Archie Cobbs archie at dellroad.org
Fri Nov 18 11:36:54 PST 2005


Blair Zajac wrote:
> Yes, you can merge from a foreign repository.  I do it all the time.

Hmm.. last time I checked adding files with history didn't work.
Try this with your version (backslashes denote line wraps)...

   mkdir -p /tmp/foo
   cd /tmp/foo
   svnadmin create repo
   svn co file:///tmp/foo/repo checkout
   cd checkout
   svn export -r 10522 \
       http://svn.collab.net/repos/svn/branches/1.1.x/subversion/po po
   svn add po
   svn ci
   cd po
   svn merge -r10522:10523 \
       http://svn.collab.net/repos/svn/branches/1.1.x/subversion/po .

I get this on the last step:

   svn: Access schema mixtures not yet supported 
('http://svn.collab.net/repos/svn/branches/1.1.x/subversion/po/ja.po' and 
'file:///tmp/foo/repo/po')

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



More information about the Svnmerge mailing list