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 9106B116DA for ; Thu, 17 Jul 2014 09:37:07 +0000 (UTC) Received: (qmail 56431 invoked by uid 500); 17 Jul 2014 09:37:06 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 56402 invoked by uid 500); 17 Jul 2014 09:37:06 -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 56392 invoked by uid 99); 17 Jul 2014 09:37:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 09:37:06 +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; Thu, 17 Jul 2014 09:37:01 +0000 Received: from mail2.neceur.com (mail2.neceur.com [195.47.207.4]) by rly61e.srv.mailcontrol.com (MailControl) with ESMTP id s6H9aZjD029541 for ; Thu, 17 Jul 2014 10:36:35 +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 s6H9aZS3018840 for ; Thu, 17 Jul 2014 10:36:35 +0100 Received: from av1.neceur.com (av1.neceur.com [172.29.14.21]) by intmail1.neceur.com (8.13.8/8.13.8) with ESMTP id s6H9aZsD031569 for ; Thu, 17 Jul 2014 10:36:35 +0100 Received: from av1.neceur.com (unknown [127.0.0.1]) by IMSVA80 (Postfix) with ESMTP id DCE21296B80 for ; Thu, 17 Jul 2014 10:36:34 +0100 (BST) Received: from EX10CAS02.EU.NEC.COM (unknown [172.29.155.134]) by av1.neceur.com (Postfix) with ESMTP id D1982296B7A for ; Thu, 17 Jul 2014 10:36:34 +0100 (BST) Received: from EX10MBX02.EU.NEC.COM ([169.254.2.210]) by EX10CAS02.EU.NEC.COM ([172.29.155.134]) with mapi id 14.02.0309.002; Thu, 17 Jul 2014 10:36:35 +0100 From: David Aldrich To: "'users@subversion.apache.org' (users@subversion.apache.org)" Subject: RE: Unexpected merge result Thread-Topic: Unexpected merge result Thread-Index: Ac+hBdX3wVREryrmSp2bzU3giWXKVQAnLDPQ Date: Thu, 17 Jul 2014 09:36:34 +0000 Message-ID: <41302A7145AC054FA7A96CFD03835A0A0B85B88F@EX10MBX02.EU.NEC.COM> References: <41302A7145AC054FA7A96CFD03835A0A0B85B16D@EX10MBX02.EU.NEC.COM> In-Reply-To: <41302A7145AC054FA7A96CFD03835A0A0B85B16D@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_41302A7145AC054FA7A96CFD03835A0A0B85B88FEX10MBX02EUNECC_" MIME-Version: 1.0 X-Scanned-By: MailControl 30291.32 (www.mailcontrol.com) on 10.69.0.171 X-Virus-Checked: Checked by ClamAV on apache.org --_000_41302A7145AC054FA7A96CFD03835A0A0B85B88FEX10MBX02EUNECC_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable A little more information: It seems that the property change is actually the removal of property svn:m= ergeinfo. David From: David Aldrich [mailto:David.Aldrich@EMEA.NEC.COM] Sent: 16 July 2014 16:04 To: 'users@subversion.apache.org' (users@subversion.apache.org) Subject: Unexpected merge result Hi I am running a svn 1.8.9 client on Windows against a 1.8.9 server. Today I created a new branch from my trunk and made some changes to the bra= nch. I want to merge those changes back to the trunk. The trunk has not bee= n changed since creating the branch. First I did a merge from trunk to branch, expecting nothing to merge, but o= ne file did change: C:\>svn status X \dsp_include Performing status on external item at '\dsp_include': C:\>svn merge ^^/trunk --- Recording mergeinfo for merge of r5824 through r5827 into '.': U . --- Eliding mergeinfo from '\StarCoMPLTE.h': U \StarCoMPLTE.h C:\SVNProj\zodiac\branches\TRY_NECA_SBM_16July2014>svn status M . X \dsp_include M \StarCoMPLTE.h The change to StarCoMPLTE.h is to properties only but I don't why the prope= rties have changed since nothing changed on the trunk. Is this a bug? How should I handle this please? Best regards David Click here to report this= email as spam. --_000_41302A7145AC054FA7A96CFD03835A0A0B85B88FEX10MBX02EUNECC_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

A little more informat= ion:

 

It seems that the prop= erty change is actually the removal of property svn:mergeinfo.

 

David

 

 

From: David Aldrich [mailto:David.Aldrich@EMEA.NEC.COM]
Sent: 16 July 2014 16:04
To: 'users@subversion.apache.org' (users@subversion.apache.org)
Subject: Unexpected merge result

 

Hi

 

I am running a svn 1.8.9 client on Windows against a= 1.8.9 server.

 

Today I created a new branch from my trunk and made = some changes to the branch. I want to merge those changes back to the trunk= . The trunk has not been changed since creating the branch.

 

First I did a merge from trunk to branch, expecting = nothing to merge, but one file did change:

 

C:\>svn status

X       <snip>\d= sp_include

 

Performing status on external item at '<snip>\= dsp_include':

 

C:\>svn merge ^^/trunk

--- Recording mergeinfo for merge of r5824 through r= 5827 into '.':

U   .

--- Eliding mergeinfo from '<snip>\StarCoMPLTE= .h':

U   <snip>\StarCoMPLTE.h<= /p>

 

C:\SVNProj\zodiac\branches\TRY_NECA_SBM_16July2014&g= t;svn status

M      .

X       <snip>\d= sp_include

M      <snip>\StarCoM= PLTE.h

 

The change to StarCoMPLTE.h is to properties only bu= t I don’t why the properties have changed since nothing changed on th= e trunk.

 

Is this a bug?  How should I handle this please= ?

 

Best regards

 

David

 

Click here to report this email as spam.

--_000_41302A7145AC054FA7A96CFD03835A0A0B85B88FEX10MBX02EUNECC_--