Hello All,
I came across this tool from the nice wiki page.
I want to use svnmerge in the following scenario in combination with svn, but I am not sure about if it will work or not. Kindly, could you check and let me know?
Also, let me know other good alternatives with constraint that I can expose only one svn port through my firewall.
I want to do this:
Mirror a SVN repository across 3 servers S0, S1, S2.
Every developer will be having only one of the servers to commit his/her changes.
Master repository will always be in S0.
This is my idea to do it.
S0: Master server has repository.
Two branches are made from the root of repository.
Branch B1 for S1
and Branch B2 for S2.
RULES FOLLOWED:
----------------------------
Developers Dev0 in S0 will use only S0, Main tree trunk
Developers Dev1 in S1 will use only B1, One branch off the main tree
Developers Dev2 in S2 will use only B2, Another branch off the main tree
Note:
1. B1 and B2 are physically separate repositories with ***timestamp*** differences from S0
FROM TIME TO TIME:
-------------- --------------
Merge B1 to S0 using svk merge...
Merge B2 to S0 using svk merge...
Resolve conflicts if any.
Release code from S0.
Note: It is OK to do 2 rounds of merging one is B1->Trunk and followed by B2->Trunk based on requirement.
QUERIES:
---------------
1. Can I use SVN to merge the two physically different repositories in Servers S0 and S1?
Basically changes in branch B1 in S1 should be merged with Trunk S0 and Final results should be in S0.
I want to know if there is any problem in doing using SVK for the merging process as described above [basically between two "different" repositories, but both with a common ansestor]?
Please help, any inputs and discussions are greatly appreciated.
./tss
Powered by the worlds shortest email address ... http://www.k.st
I came across this tool from the nice wiki page.
I want to use svnmerge in the following scenario in combination with svn, but I am not sure about if it will work or not. Kindly, could you check and let me know?
Also, let me know other good alternatives with constraint that I can expose only one svn port through my firewall.
I want to do this:
Mirror a SVN repository across 3 servers S0, S1, S2.
Every developer will be having only one of the servers to commit his/her changes.
Master repository will always be in S0.
This is my idea to do it.
S0: Master server has repository.
Two branches are made from the root of repository.
Branch B1 for S1
and Branch B2 for S2.
RULES FOLLOWED:
----------------------------
Developers Dev0 in S0 will use only S0, Main tree trunk
Developers Dev1 in S1 will use only B1, One branch off the main tree
Developers Dev2 in S2 will use only B2, Another branch off the main tree
Note:
1. B1 and B2 are physically separate repositories with ***timestamp*** differences from S0
FROM TIME TO TIME:
-------------- --------------
Merge B1 to S0 using svk merge...
Merge B2 to S0 using svk merge...
Resolve conflicts if any.
Release code from S0.
Note: It is OK to do 2 rounds of merging one is B1->Trunk and followed by B2->Trunk based on requirement.
QUERIES:
---------------
1. Can I use SVN to merge the two physically different repositories in Servers S0 and S1?
Basically changes in branch B1 in S1 should be merged with Trunk S0 and Final results should be in S0.
I want to know if there is any problem in doing using SVK for the merging process as described above [basically between two "different" repositories, but both with a common ansestor]?
Please help, any inputs and discussions are greatly appreciated.
./tss
Powered by the worlds shortest email address ... http://www.k.st
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
