Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 18381 invoked from network); 5 Jul 2006 22:22:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Jul 2006 22:22:02 -0000 Received: (qmail 81668 invoked by uid 500); 5 Jul 2006 22:22:01 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 81631 invoked by uid 500); 5 Jul 2006 22:22:01 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 81620 invoked by uid 99); 5 Jul 2006 22:22:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 15:22:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 15:22:00 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A980F1A981A; Wed, 5 Jul 2006 15:21:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419363 - /geronimo/sandbox/svkmerge/README.txt Date: Wed, 05 Jul 2006 22:21:40 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060705222140.A980F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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