[svk-devel] Merging different mirrors via local branches
Fuchs, Jean-Louis
jean-louis.fuchs at siemens.com
Sat Jul 14 13:14:17 EDT 2007
Hello
I wanted to merge something into an other mirror via a local branch.
First I created two svn repos and mirrored them. I'm using svk 2.0.0 on
win32.
#cd c:\test
#svnadmin create test1
#svnadmin create test2
#svk mirror file:///c:/test/test1 /test/test1
#svk mirror file:///c:/test/test2 /test/test2
#svk sync -a
#svk cp /test/test1 /test/localtest1
#svk cp /test/test2 /test/localtest2
#svk cp /test/localtest1 /test/localtest2/test1
#svk co /test/localtest1 test
#cd test
#notepad test.txt
#svk add test.txt
#svk ci
#svk pull /test/localtest2/test1
Auto-merging (3, 6) /localtest1 to /localtest2/test1 (base
/localtest1:3).
A test.txt
New merge ticket: 3196383b-c7df-624a-9d27-075a66597ae3:/localtest1:6
Committed revision 7.
#svk push /test/localtest2
C:\test\test>svk push /test/localtest2
Auto-merging (0, 7) /localtest2 to /test2 (base /:0).
===> Auto-merging (0, 4) /localtest2 to /test2 (base /:0).
Merging back to mirror source file:///c:/test/test2.
Empty merge.
===> Auto-merging (4, 5) /localtest2 to /test2 (base /:0).
Merging back to mirror source file:///c:/test/test2.
General filesystem error: Source url '/localtest1' is from different
repository
Is there any way to do this?
Our group develops a library which is in our svn repo (test1) another
group (test2) have their own svn repo and they need to get the library.
Every now and then they'll contribute to the library. If I could do that
setup I could simply do:
#svk sync /test/test2
#svk pull /test/localtest2
#svk push /test/localtest2/test1
And their changes are merged into my repo /test/localtest1.
Thanks for any help. I hope I can somehow do a setup like this.
Best,
Jean
More information about the svk-devel
mailing list