From users-return-1092-daniel=haxx.se@subversion.apache.org Thu Feb 18 17:27:00 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o1IGQx2T003555 for ; Thu, 18 Feb 2010 17:27:00 +0100 Received: (qmail 86613 invoked by uid 500); 18 Feb 2010 16:26:54 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 86605 invoked by uid 99); 18 Feb 2010 16:26:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 16:26:54 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [208.69.42.181] (HELO radix.cryptio.net) (208.69.42.181) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 16:26:47 +0000 Received: by radix.cryptio.net (Postfix, from userid 1044) id 0631E71C240; Thu, 18 Feb 2010 08:26:26 -0800 (PST) Date: Thu, 18 Feb 2010 08:26:26 -0800 From: Tyler Roscoe To: Jacob Weber Cc: Mark Phippard , users@subversion.apache.org Subject: Re: Partially reintegrate changes Message-ID: <20100218162626.GB20324@cryptio.net> References: <53528279-358E-4FDF-A769-FBB7EEEA0CAC@jacobweber.com> <5A19A4BD-AB3F-45C1-B3F1-5D19987AD83F@jacobweber.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5A19A4BD-AB3F-45C1-B3F1-5D19987AD83F@jacobweber.com> User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Checked: Checked by ClamAV on apache.org On Thu, Feb 18, 2010 at 08:20:10AM -0800, Jacob Weber wrote: > > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > >> Let's say I have a branch where I develop two features, X and Y. I then want to merge only X back > >> into the trunk. I want to do some further development on Y, and merge it into trunk later. > >> > >> Is this possible with Subversion? > > > > Yes. When merging from branch to trunk, you would need to specify the > > specific revisions to merge. You could not use reintegrate. Let's > > assume when you commit this merge to trunk that revision 200 is > > created. > > > > Back on the branch you should run: > > > > svn merge --record-only -c200 ^/trunk > > > > To record the merge. Now you can just do normal synch merges with > > trunk and reintegrate the branch when you are done. > > > Thanks! I'll give that a try. > > But I was under the impression that if I did a non-reintegrate merge > back into the trunk, it would cause self-referential mergeinfo to be > written there. That is, the trunk would have mergeinfo for the trunk. > And then that ends up screwing up things later on. The --record-only merge is what keeps you away from this problem. tyler