[svk-devel] Need help merging two SVN repostories with SVK

[dev null]

Hi,
   
  I need help to figure out the proper way to setup SVK to keep two SVN repositories in sync.  Currently, we have one group of developers working from the primary SVN repository using SVN clients.  There will be another group of developers that will be working on the same project at another location and they will prefer to use SVN clients too.  Therefore, my goal is to maintain two identical SVN repositories with the help of SVK.  I've been testing the following setup scenarios:
   
  Scenario #1:
  1) First location hosts primary SVN repository (svn://primary-repos/)
  2) Second location mirrors the primary repository with SVK and makes a local copy.
      svk mirror svn://primary-repos/ //mirror
    svk sync //mirror
      svk cp -m "Create a local branch" //mirror //local
  3) Developers at the second location work on SVK branch(//local) using SVN clients.  But then according to SVKTool webpage, it indicates that there are consequences when using SVN clients on a SVK depot.  Therefore this scenario will not work.
   
  Scenario #2:
  1) Second location hosts the secondary SVN repository (svn://secondary-repos/).
  2) First location hosts the primary SVN repository (svn://primary-repos/)  On the same server, SVK mirrors the primary repository and the secondary repository.
      svk mirror svn://primary-repos/ //primary
      svk sync //primary            # This repos contains all the source codes
      svk mirror svn://secondary-repos/ //secondary
      svk sync //secondary        # This repos is completely empty at the moment
  3) SVK merges the code from //primary to //secondary and it went well.  The primary SVN repos and the secondary SVN repos are indentical now.
      svk smerge --log --incremental --baseless //primary //secondary
  4) There is problem when SVK merges code changes from //secondary back to //primary.  It merge every revision starting with revision 2.  The process took couple hours and all of them are empty merges except for the last two.
      svk sync //primary
      svk sync //secondary
      svk smerge --log --incremental --baseless //secondary //primary
   
  Is scenario #2 the proper setup for the job? If so, is there a way or svk command that can make merging between two mirrors happen faster? because i'm thinking of using SVN hooks to trigger SVK merging on every user commit.  Any advice will be greatly appreciated and i'm so sorry the long post.
   
  Thanks,
  Eric

       
---------------------------------
Pinpoint customers who are looking for what you sell. 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20071004/f5f4403a/attachment.htm