Wednesday Jan 17, 2007

svk woes update

Time for an update to my svk woes that I was speaking of a few days back. So it turns out that the solution was not far from where I was... just a few extra steps. So the scenario is that we desired to mirror a workspace from an external svn server and then have a place to internally merge in changes before publishing them back out to the community. Simple right... now it is.

  • Setup internal mirror:
    % svk mirror http://svn.open-mpi.org/svn/ompi/branches/v1.2 /mydepot/ompi-v1.2
  • Copy the mirror to a project space for merging:
    % svk copy /mydepot/ompi-v1.2 /mydepot/ompi-project
  • Now I can check out a copy of my project workspace, make changes, commits
  • To merge changes into the project area then use:
    % svk smerge /mydepot/ompi-v1.2 /mydepot/ompi-project

When we are ready we can then publish the change all the way back to the main svn parent and not break the headrev like we did in the past.

For what it's worth.

About

dlacher

Search

Archives
« April 2014
SunMonTueWedThuFriSat
  
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
   
       
Today