From users-return-1086-daniel=haxx.se@subversion.apache.org Thu Feb 18 16:38:05 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 o1IFc4Od027845 for ; Thu, 18 Feb 2010 16:38:04 +0100 Received: (qmail 91787 invoked by uid 500); 18 Feb 2010 15:37:59 -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 91779 invoked by uid 99); 18 Feb 2010 15:37:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 15:37:59 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of markphip@gmail.com designates 209.85.222.192 as permitted sender) Received: from [209.85.222.192] (HELO mail-pz0-f192.google.com) (209.85.222.192) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 15:37:52 +0000 Received: by pzk30 with SMTP id 30so146644pzk.22 for ; Thu, 18 Feb 2010 07:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=YeeP+zH10ezYjo45U5z1yRcaLDckr2WGYfPxPXRnO5s=; b=HBczBOLxTJ+R5DDXTlCuSwu9t8yEyGptdHy6V+21mNDlgV+ZF/TGFXXdIfJQtk2DgG ZXyoKZdEfg/rUqZwrVqkUo31O/ditK6WG0Rfs77F6k1oQpIORPk5bYAYDQZSV/1Q9Cew Tw5jb486HlXpPayT6YoRyOZvmvGMBe9OC/sto= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=Qbtaf2OeZv3wdEz5wDBZPgdUiDDEo3OiKdekETHQYPDC7DiDMguu4k5t4NkU2tBT5I ZBGhSTchLZ2h9rvIMqAteQFlbpG0vo0HfWBScTFpX0jdjofZoJiuZQ83BQ1oWfn29P0n T9eq4ODBIQC2BdB4h0U/QdeOLbJ7/LqttlH54= MIME-Version: 1.0 Received: by 10.143.153.25 with SMTP id f25mr6455590wfo.168.1266507452164; Thu, 18 Feb 2010 07:37:32 -0800 (PST) In-Reply-To: <53528279-358E-4FDF-A769-FBB7EEEA0CAC@jacobweber.com> References: <53528279-358E-4FDF-A769-FBB7EEEA0CAC@jacobweber.com> Date: Thu, 18 Feb 2010 07:37:32 -0800 Message-ID: Subject: Re: Partially reintegrate changes From: Mark Phippard To: Jacob Weber Cc: users@subversion.apache.org Content-Type: text/plain; charset=ISO-8859-1 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 Mark Phippard http://markphip.blogspot.com/