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 E3F3C905C for ; Tue, 9 Oct 2012 08:21:04 +0000 (UTC) Received: (qmail 29934 invoked by uid 500); 9 Oct 2012 08:21:04 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 29722 invoked by uid 500); 9 Oct 2012 08:21:02 -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 29664 invoked by uid 99); 9 Oct 2012 08:21:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 08:21:00 +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 (athena.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; Tue, 09 Oct 2012 08:20:47 +0000 Received: from mail2.neceur.com (mail2.neceur.com [195.47.207.4]) by rly60e.srv.mailcontrol.com (MailControl) with ESMTP id q998KJJ1021293 for ; Tue, 9 Oct 2012 09:20:20 +0100 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 q998KJ8g027425 for ; Tue, 9 Oct 2012 09:20:19 +0100 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 q998KJSQ032005 for ; Tue, 9 Oct 2012 09:20:19 +0100 Received: from av2.neceur.com (unknown [127.0.0.1]) by IMSVA80 (Postfix) with ESMTP id 838E9226F0F for ; Tue, 9 Oct 2012 09:20:19 +0100 (BST) Received: from EX10CAS01.EU.NEC.COM (unknown [172.29.155.132]) by av2.neceur.com (Postfix) with ESMTP id 76646226EF4 for ; Tue, 9 Oct 2012 09:20:19 +0100 (BST) Received: from EX10MBX02.EU.NEC.COM ([169.254.2.211]) by EX10CAS01.EU.NEC.COM ([172.29.155.132]) with mapi id 14.02.0309.002; Tue, 9 Oct 2012 09:20:19 +0100 From: David Aldrich To: "'users@subversion.apache.org' (users@subversion.apache.org)" Subject: Help needed: 'History scheduled with commit' Thread-Topic: Help needed: 'History scheduled with commit' Thread-Index: Ac2l9e3l7SrDGl4KRbyNdHEZ5TgsCg== Date: Tue, 9 Oct 2012 08:20:19 +0000 Message-ID: <41302A7145AC054FA7A96CFD03835A0A1A16A7@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.109] Content-Type: multipart/alternative; boundary="_000_41302A7145AC054FA7A96CFD03835A0A1A16A7EX10MBX02EUNECCOM_" MIME-Version: 1.0 X-Scanned-By: MailControl 9446.0 (www.mailcontrol.com) on 10.69.0.170 X-Virus-Checked: Checked by ClamAV on apache.org --_000_41302A7145AC054FA7A96CFD03835A0A1A16A7EX10MBX02EUNECCOM_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi We have just merged a branch into the trunk (reintegration), but have not c= ommitted the merge because some files are marked as 'History scheduled with= commit'. We don't know what to do about these. A new folder was added to the branch. That folder is marked 'Added' in the= merge, but the files that it contained are marked 'History scheduled with = commit' and do not appear in the list of files that will be added. svn stat output: A + - 4754 ? folder1 + - 4754 ? folder1\folder2 + - 4201 username folder1\ folder2\file1 + - 4201 username folder1\ folder2\file2 I want the folder AND its contents to be merged into the trunk. How do I fix this please? Best regards David --_000_41302A7145AC054FA7A96CFD03835A0A1A16A7EX10MBX02EUNECCOM_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi

 

We have just merged a branch into the trunk (reinteg= ration), but have not committed the merge because some files are marked as = ‘History scheduled with commit’.  We don’t know what= to do about these.

 

A new folder was added to the branch.  That fol= der is marked ‘Added’ in the merge, but the files that it conta= ined are marked ‘History scheduled with commit’ and do not appe= ar in the list of files that will be added.

 

= svn stat output:

 

= A  +          &n= bsp;  -     4754  ?    &n= bsp;    folder1

=    +         &nb= sp;   -     4754  ?   &nb= sp;     folder1\folder2

=    +         &nb= sp;   -     4201 username   folder1= \ folder2\file1

=    +         &nb= sp;   -     4201 username   folder1= \ folder2\file2

 

I want the folder AND its contents to be merged into= the trunk.

 

How do I fix this please?

 

Best rega= rds

&nbs= p;

David

 

--_000_41302A7145AC054FA7A96CFD03835A0A1A16A7EX10MBX02EUNECCOM_--