geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419363 - /geronimo/sandbox/svkmerge/README.txt
Date Wed, 05 Jul 2006 22:21:40 GMT
Author: jdillon
Date: Wed Jul  5 15:21:39 2006
New Revision: 419363

URL: http://svn.apache.org/viewvc?rev=419363&view=rev
Log:
Document steps to use SVK to merge entire trees


Added:
    geronimo/sandbox/svkmerge/README.txt   (with props)

Added: geronimo/sandbox/svkmerge/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/README.txt?rev=419363&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/README.txt (added)
+++ geronimo/sandbox/svkmerge/README.txt Wed Jul  5 15:21:39 2006
@@ -0,0 +1,35 @@
+##
+## $Id$
+##
+
+ +-----------+
+ | Setup SVK |
+ +-----------+
+
+    svk depotmap --init
+
+
+ +-------------------+
+ | Setup SVK Mirrors |
+ +-------------------+
+
+    svk mirror https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/trunk //svkmerge/trunk
+    svk sync //svkmerge/trunk
+    
+    svk mirror https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration //svkmerge/m2migration
+    svk sync //svkmerge/m2migration
+
+
+ +-----------------------+
+ | Merge/Pull From Trunk |
+ +-----------------------+
+
+    svk smerge //svkmerge/trunk //svkmerge/m2migration --baseless --sync
+
+
+ +---------------------+
+ | Merge/Push To Trunk |
+ +---------------------+
+
+    svk smerge //svkmerge/m2migration //svkmerge/trunk --baseless --sync
+

Propchange: geronimo/sandbox/svkmerge/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message