From users-return-21047-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Wed Mar 12 15:02:16 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 ED1D210D0C for ; Wed, 12 Mar 2014 15:02:15 +0000 (UTC) Received: (qmail 52284 invoked by uid 500); 12 Mar 2014 15:02:15 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 52266 invoked by uid 500); 12 Mar 2014 15:02:14 -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 52257 invoked by uid 99); 12 Mar 2014 15:02: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 15:02:13 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=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.52.190 as permitted sender) Received: from [85.115.52.190] (HELO cluster-a.mailcontrol.com) (85.115.52.190) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 15:02:07 +0000 Received: from mail2.neceur.com (mail2.neceur.com [195.47.207.4]) by rly10a.srv.mailcontrol.com (MailControl) with ESMTP id s2CF1RvF000681; Wed, 12 Mar 2014 15:01:28 GMT Received: from intmail1.neceur.com (intmail1.neceur.com [172.29.14.11]) by mail2.neceur.com (8.14.4/8.14.4) with ESMTP id s2CF1RWd025965; Wed, 12 Mar 2014 15:01:27 GMT Received: from av2.neceur.com (av2.neceur.com [172.29.177.7]) by intmail1.neceur.com (8.13.8/8.13.8) with ESMTP id s2CF1RxH006464; Wed, 12 Mar 2014 15:01:27 GMT Received: from av2.neceur.com (unknown [127.0.0.1]) by IMSVA80 (Postfix) with ESMTP id 6612E226F14; Wed, 12 Mar 2014 15:01:27 +0000 (GMT) Received: from EX10CAS01.EU.NEC.COM (unknown [172.29.155.132]) by av2.neceur.com (Postfix) with ESMTP id 56033226EF4; Wed, 12 Mar 2014 15:01:27 +0000 (GMT) Received: from EX10MBX02.EU.NEC.COM ([169.254.2.223]) by EX10CAS01.EU.NEC.COM ([172.29.155.132]) with mapi id 14.02.0309.002; Wed, 12 Mar 2014 15:01:26 +0000 From: David Aldrich To: Bob Archer , "'users@subversion.apache.org' (users@subversion.apache.org)" Subject: RE: 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+ARh03lV02cXiQgu29Bu6kX6mSwAAb80AAABDAZA= Date: Wed, 12 Mar 2014 15:01:25 +0000 Message-ID: <41302A7145AC054FA7A96CFD03835A0A0B7F5A95@EX10MBX02.EU.NEC.COM> References: <41302A7145AC054FA7A96CFD03835A0A0B7F5A5D@EX10MBX02.EU.NEC.COM> In-Reply-To: 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Scanned-By: MailControl 26514.0 (www.mailcontrol.com) on 10.65.0.120 X-Virus-Checked: Checked by ClamAV on apache.org Hi Bob Understood. Thanks for your reply. David -----Original Message----- From: Bob Archer [mailto:Bob.Archer@amsi.com]=20 Sent: 12 March 2014 14:54 To: David Aldrich; 'users@subversion.apache.org' (users@subversion.apache.o= rg) Subject: RE: How to do a partial merge from branch to trunk? > Hi >=20 > I am working on a branch and I want to feed some (but not all) of my=20 > changes back into the trunk and then to continue work on the branch. >=20 > Please will someone advise me of the correct way to handle this situation= ? >=20 > Best regards >=20 > David Generally the smallest unit you can merge is a single changeset. Check out = the docs on merging and look for the Cherrypicking section. Click https://www.mailcontrol.com/sr/bcXItoTZgCjGX2PQPOmvUoXR17WSa92v1rnK1= DZKkWNxO0ZbWdUlxaBFThUi75+9gfoCO8sfTsFfcZxYauAECA=3D=3D to report this ema= il as spam.