From users-return-21045-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Wed Mar 12 14:44:41 2014 Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C63B10C3A for ; Wed, 12 Mar 2014 14:44:41 +0000 (UTC) Received: (qmail 95019 invoked by uid 500); 12 Mar 2014 14:44:34 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 94918 invoked by uid 500); 12 Mar 2014 14:44:25 -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 94633 invoked by uid 99); 12 Mar 2014 14:44:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 14:44:13 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of David.Aldrich@emea.nec.com designates 85.115.58.190 as permitted sender) Received: from [85.115.58.190] (HELO cluster-e.mailcontrol.com) (85.115.58.190) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 14:44:05 +0000 Received: from mail1.neceur.com (mail1.neceur.com [195.47.207.3]) by rly61e.srv.mailcontrol.com (MailControl) with ESMTP id s2CEhJ14014033 for ; Wed, 12 Mar 2014 14:43:23 GMT Received: from intmail2.neceur.com (intmail2.neceur.com [172.29.177.11]) by mail1.neceur.com (8.14.4/8.14.4) with ESMTP id s2CEhIdI014207 for ; Wed, 12 Mar 2014 14:43:19 GMT Received: from av2.neceur.com (av2.neceur.com [172.29.177.7]) by intmail2.neceur.com (8.13.8/8.13.8) with ESMTP id s2CEhIvg011616 for ; Wed, 12 Mar 2014 14:43:18 GMT Received: from av2.neceur.com (unknown [127.0.0.1]) by IMSVA80 (Postfix) with ESMTP id 6D98D226F14 for ; Wed, 12 Mar 2014 14:43:18 +0000 (GMT) Received: from EX10CAS02.EU.NEC.COM (unknown [172.29.155.134]) by av2.neceur.com (Postfix) with ESMTP id 636D9226F0F for ; Wed, 12 Mar 2014 14:43:18 +0000 (GMT) Received: from EX10MBX02.EU.NEC.COM ([169.254.2.223]) by EX10CAS02.EU.NEC.COM ([172.29.155.134]) with mapi id 14.02.0309.002; Wed, 12 Mar 2014 14:43:18 +0000 From: David Aldrich To: "'users@subversion.apache.org' (users@subversion.apache.org)" Subject: How to do a partial merge from branch to trunk? Thread-Topic: How to do a partial merge from branch to trunk? Thread-Index: Ac8+ARh03lV02cXiQgu29Bu6kX6mSw== Date: Wed, 12 Mar 2014 14:43:17 +0000 Message-ID: <41302A7145AC054FA7A96CFD03835A0A0B7F5A5D@EX10MBX02.EU.NEC.COM> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.29.68.43] Content-Type: multipart/alternative; boundary="_000_41302A7145AC054FA7A96CFD03835A0A0B7F5A5DEX10MBX02EUNECC_" MIME-Version: 1.0 X-Scanned-By: MailControl 26514.0 (www.mailcontrol.com) on 10.69.0.171 X-Virus-Checked: Checked by ClamAV on apache.org --_000_41302A7145AC054FA7A96CFD03835A0A0B7F5A5DEX10MBX02EUNECC_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi I am working on a branch and I want to feed some (but not all) of my change= s back into the trunk and then to continue work on the branch. Please will someone advise me of the correct way to handle this situation? Best regards David --_000_41302A7145AC054FA7A96CFD03835A0A0B7F5A5DEX10MBX02EUNECC_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi

 

I am working on a branch and I want to feed some (bu= t not all) of my changes back into the trunk and then to continue work on t= he branch.

 

Please will someone advise me of the correct way to = handle this situation?

 

Best rega= rds

&nbs= p;

David

--_000_41302A7145AC054FA7A96CFD03835A0A0B7F5A5DEX10MBX02EUNECC_--