You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/07 08:42:14 UTC

svn commit: r419828 - /geronimo/sandbox/svkmerge/README.txt

Author: jdillon
Date: Thu Jul  6 23:42:14 2006
New Revision: 419828

URL: http://svn.apache.org/viewvc?rev=419828&view=rev
Log:
Added note about theirs/yours and example to setup main trunk mirror

Modified:
    geronimo/sandbox/svkmerge/README.txt

Modified: geronimo/sandbox/svkmerge/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/README.txt?rev=419828&r1=419827&r2=419828&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/README.txt (original)
+++ geronimo/sandbox/svkmerge/README.txt Thu Jul  6 23:42:14 2006
@@ -12,7 +12,10 @@
  +-------------------+
  | Setup SVK Mirrors |
  +-------------------+
-
+    
+    svk mirror https://svn.apache.org/repos/asf/geronimo/trunk //geronimo/trunk
+    svk sync //geronimo/trunk
+    
     svk mirror https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/trunk //svkmerge/trunk
     svk sync //svkmerge/trunk
     
@@ -32,4 +35,7 @@
  +---------------------+
 
     svk smerge //svkmerge/m2migration //svkmerge/trunk --baseless --sync
+
+
+When smerge'ing the depot that will change is 'yours' when resolving conflicts.