Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 404582004F5 for ; Fri, 1 Sep 2017 16:27:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3E86B16D1B9; Fri, 1 Sep 2017 14:27:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 875B416D1B8 for ; Fri, 1 Sep 2017 16:27:02 +0200 (CEST) Received: (qmail 47599 invoked by uid 500); 1 Sep 2017 14:27:00 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 47588 invoked by uid 99); 1 Sep 2017 14:27:00 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2017 14:27:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 7586BC38AB for ; Fri, 1 Sep 2017 14:26:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, SPF_HELO_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id WovJXrTwLjRJ for ; Fri, 1 Sep 2017 14:26:53 +0000 (UTC) Received: from mailbox.servedge.com (li1281-212.members.linode.com [45.79.182.212]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 71F9C5F1EE for ; Fri, 1 Sep 2017 14:26:53 +0000 (UTC) Received: (qmail 3542 invoked by uid 513); 1 Sep 2017 09:26:52 -0500 Received: from pool-173-66-116-184.washdc.fios.verizon.net (HELO Christophers-iMac.local) (chris@christopherschultz.net@173.66.116.184) by mailbox.servedge.com with AES128-SHA encrypted SMTP; 1 Sep 2017 09:26:52 -0500 Subject: Re: [OT] Moving files between projects in svn To: dev@tomcat.apache.org References: <84a353ac-8ff1-db55-21b8-a5147cc615ba@christopherschultz.net> <3b15b1aa-0046-1383-0d06-2af81209ab1a@christopherschultz.net> From: Christopher Schultz Message-ID: <2fe870e6-cab6-16bd-3eeb-2714da3d15bb@christopherschultz.net> Date: Fri, 1 Sep 2017 10:26:51 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit archived-at: Fri, 01 Sep 2017 14:27:03 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Konstantin, On 9/1/17 5:10 AM, Konstantin Kolinko wrote: > 2017-09-01 0:42 GMT+03:00 Christopher Schultz > : >> >> Mark, >> >> On 8/31/17 5:38 PM, Mark Thomas wrote: >>> On 31/08/17 22:13, Christopher Schultz wrote: >>>> All, >>>> >>>> I've got a subversion repository with multiple "projects" >>>> similar to how ASF has their set up: each project gets a >>>> top-level directory, then /trunk, /tags, and /branches below >>>> each of those top-levels. >>>> >>>> I'd like to merge two of my projects together, and I can >>>> only see three options: >>>> >>>> 1. Check out the entire repository and "svn mv" individual >>>> files/directories between the projects in the working copy, >>>> then do a single commit. >>>> >>>> 2. Do an "svn mv project-url-A project-url-b/temp" and then >>>> move the files around within the working copy of >>>> project-url-b to get them where I want them. >>>> >>>> This will create at least two commits, where the first >>>> commit creates a bit of a not-sane state with regard to >>>> project-b, but isn't the worst thing that could happen. >>>> >>>> 3. Do individual "svn mv" operations on each of the files >>>> and directories I want to move as URLs (i.e. not using the >>>> working-copy). This will create many commits where the state >>>> of project-B is potentially broken. >>>> >>>> Are there any other ways of doing this that I haven't thought >>>> of? I'd really like to have a single commit that goes from >>>> these projects being separate to them being unified without >>>> breaking any builds or doing any "temp" funny business like I >>>> have in option 2 above. >>> >>> 1. but with a sparse checkout so you only checkout the projects >>> you want to merge? >> >> Sounds perfect. Thanks for the pointer. :) > > +1 > > For sake of completeness, there is also a tool called "svnmucc", > which nowadays is included with standard svn distribution. > > http://svnbook.red-bean.com/en/1.8/svn.ref.svnmucc.re.html > > It can perform several move operations in the same commit. Thanks for the additional reference. In my case, the sparse-checkout made a lot more sense, because I needed to do things like run our test suite on the resulting working copy before I committed anything. But next time I need to "archive" a whole bunch of RCs or really old tags or something, I'll definitely keep svnmucc in mind. - -chris -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJZqW4rAAoJEBzwKT+lPKRY+R0P/1P2i3X4DcWEzPf7Fq5xwty1 KG4zMJ8Tmc8Ko4bnYneng85o1c5iCU4Yu4WdWEbsSdjHUJVOb292Y4MxzSWDECPB ZC/Z5jIVR551IojasuIdBxsvYoZiThhCWtQYMy/SGoFWlu9k7uIKwvUvjDm2i7F8 TaBjb9stdbQamFqKgjEKRKMImOsV1JgjQH9hpIPOKqobJxPjNn3l+mjLp1BubS50 fT7Vw0XrEmbNOFXHIFSWQsbG6hgp/8E0ERq52srpRlsh1tTsrNdDtWyrDGOvpnyG R52c1DRX5znfMhfl0ms7fAmsNPCdcPCh137zb4ciJkx4s6JjTAuXM386nOvsoATf afPrhGfJXNtjthRV3GsEyUlhTQBKNuFuubXSkyw+yHzvurdWLfqrOQj/3hQgvTxt jDnwvk4MCaB4FAaA4eDs/9vOBRCX+spF9JDhfXr7mvh5UvU9RPsio51ITfP+lWtw ThO1d6gf9RNfCGPc3vQOuph52mXeK2lVxTb6CT1iiTwKWglUM9gxsxlzqepAb52N El82S0/MgSU56KPJKVl7vrc0hwrRoLIuRGQt087li2DwlJ5C1OHRvEmyu54tN1+t 2Lo1Z3lSPlrhSD3BIktMmp0at7cuxAdsx7QMNAIw1N0iPkIpSFkyqtPrwj4Yu8ms yoRz1fktJa8JJaAZ21J6 =K9w9 -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org