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 067E610E1C for ; Tue, 4 Jun 2013 17:44:26 +0000 (UTC) Received: (qmail 1081 invoked by uid 500); 4 Jun 2013 17:44:25 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 973 invoked by uid 500); 4 Jun 2013 17: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 965 invoked by uid 99); 4 Jun 2013 17:44:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 17:44:25 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: encountered temporary error during SPF processing of domain of jhanley@dgtlrift.com) Received: from [209.85.215.51] (HELO mail-la0-f51.google.com) (209.85.215.51) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 17:44:20 +0000 Received: by mail-la0-f51.google.com with SMTP id fq12so310559lab.24 for ; Tue, 04 Jun 2013 10:43:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=epNB2+08eE0BYSqBvKFLEKn2AQObfnQJ63KLjigcLtI=; b=VTGV59TVMQbDe4y4olccH0WrvZ2nP6W9otki58rZjE3U7IYE8Ny1Nr/HeJcwiOQze/ 3iDtc0mUBmv8g/0ntkriEbn/76CbjP5WgJiQYW5oU0fxSEf1qoid7wKGdVAGVX++zPDL 2qSOvZKyyO3z4S2UlzYRmhCOrTHQPNOhz92oJaMaGSd8hp0Lnqv+jzNH8c+kPJodWDSS KevmCf1uW5XJjcFWbUrQxPv4DrApyN8JOqJKuk2RgdueOANh7UmAJ9Rt1YCQJSLzvMkj v0+eulujctTWZjHlVMAMqYjvCyhV3/CYCrw1Axqy4BS+aW6oMH6xL5V5ih3v6XDGAsHL sX3Q== MIME-Version: 1.0 X-Received: by 10.112.182.10 with SMTP id ea10mr13289571lbc.36.1370367817233; Tue, 04 Jun 2013 10:43:37 -0700 (PDT) Received: by 10.114.185.73 with HTTP; Tue, 4 Jun 2013 10:43:37 -0700 (PDT) Date: Tue, 4 Jun 2013 13:43:37 -0400 Message-ID: Subject: Tree conflict on Fresh checkout From: James Hanley To: "users@subversion.apache.org" Content-Type: multipart/alternative; boundary=001a11c36b08f5478e04de579e6d X-Gm-Message-State: ALoCoQmyRAx8uAd2ZMDLM2CUdMuCgTEZ4QeVbNx/FKmEkXdr7qFFyq01I60Jqn7y9Tp2yrJmXQAk X-Virus-Checked: Checked by ClamAV on apache.org --001a11c36b08f5478e04de579e6d Content-Type: text/plain; charset=ISO-8859-1 We are seeing a strange anomaly after our last check-in - on fresh checkout there is a tree conflict into a new path - I've included the output below. user_dude@computer_node~/projects/my_project $ svn co https://svn.my_company.com/svn/my_project_fw/branches/int/ my_project_03b my_project_03b_pristine A my_project_03b_pristine/Test A my_project_03b_pristine/Test/Global A my_project_03b_pristine/Test/Global/Default A my_project_03b_pristine/Test/Global/Default/Configuration A my_project_03b_pristine/Test/Global/Default/Configuration/TEMPLATE.asn ... A my_project_03b_pristine/Project/settings/run.cmd A my_project_03b_pristine/Project/settings/MkSharedData.exe C my_project_03b_pristine/Project/settings/MkImage A my_project_03b_pristine/Project/settings/MkImage/main.c A my_project_03b_pristine/Project/settings/MkImage/defs.h A my_project_03b_pristine/Project/settings/MkImage/Makefile A my_project_03b_pristine/Project/settings/hex_to_hex.exe A my_project_03b_pristine/Project/settings/composit.cmp A my_project_03b_pristine/Project/settings/GenCrc.pl ... A my_project_03b_pristine/Documentation/Architecture.docx A my_project_03b_pristine/.pydevproject A my_project_03b_pristine/Makefile A my_project_03b_pristine/.settings A my_project_03b_pristine/.settings/org.eclipse.cdt.codan.core.prefs U my_project_03b_pristine Checked out revision 2577. user_dude@computer_node~/projects/my_project $ svn status svn: warning: W155007: '/cygdrive/D/Users/user_dude/projects/my_project' is not a working copy user_dude@computer_node~/projects/my_project $ cd my_project_03b_pristine/ user_dude@computer_node~/projects/my_project/my_project_03b_pristine $ svn status D C Project/settings/MkImage > local unversioned, incoming add upon update D Project/settings/MkImage/Makefile D Project/settings/MkImage/defs.h D Project/settings/MkImage/main.c Summary of conflicts: Tree conflicts: 1 user_dude@computer_node~/projects/my_project/my_project_03b_pristine $ This happens on svn 1.7.9 and 1.7.10, but not 1.7.6, 1.6.13, nor on TortoiseSVN of the last couple of revs. $ svn --version svn, version 1.7.9 (r1462340) compiled Apr 14 2013, 10:11:47 Copyright (C) 2013 The Apache Software Foundation. This software consists of contributions made by many people; see the NOTICE file for more information. Subversion is open source software, see http://subversion.apache.org/ The following repository access (RA) modules are available: * ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - with Cyrus SASL authentication - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme * ra_serf : Module for accessing a repository via WebDAV protocol using serf. - handles 'http' scheme - handles 'https' scheme $ svn --version svn, version 1.7.10 (r1485443) compiled Jun 1 2013, 14:51:22 Copyright (C) 2013 The Apache Software Foundation. This software consists of contributions made by many people; see the NOTICE file for more information. Subversion is open source software, see http://subversion.apache.org/ The following repository access (RA) modules are available: * ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - with Cyrus SASL authentication - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme * ra_serf : Module for accessing a repository via WebDAV protocol using serf. - handles 'http' scheme - handles 'https' scheme Since I have a workaround (TortoiseSVN) is there anything I should be concerned about with this revision? Is this anomaly or artifact going to cause problems for us later with our current version of SVN? Is this anomaly or artifact going to cause problems for us later, when upgrading to a new version of SVN. How was this caused? Is there additional information (property/meta data) that can help pin-point the cause? Thanks much, take care, -Jim --001a11c36b08f5478e04de579e6d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
We are seeing a strange anomaly after our last check-= in - on fresh checkout there is a tree conflict into a new path - I've = included the output below.

us= er_dude@computer_node~/projects/my_project
$ svn co https://svn.my_company= .com/svn/
my_project_fw/branches/int/my_proj= ect_03b my_project_03b_pristine
A =A0=A0
my_project_03b_pristine/Test
A=20 =A0=A0
my_project_03b_pristine/Test/Global
A=20 =A0=A0
my_project_03b_pristine/Test/Global/Default
A=20 =A0=A0
my_project_03b_pristine/Test/Global/Default/Configu= ration
A=20 =A0=A0
my_project_03b_pristine/Test/Global/Default/Configu= ration/TEMPLATE.asn
...
A=20 =A0=A0 my_project_03b_pristine/Project/settings/run.cmdA=20 =A0=A0 my_project_03b_pristine/Project/settings/MkSharedDa= ta.exe
=A0=A0C
my_project_03b_pristine/Project/setting= s/MkImage
=A0=A0A
my_project_03b_pristine/Project/settings/MkImage/m= ain.c
=A0=A0A
my_project_03b_pristine/Project/setting= s/MkImage/defs.h
=A0=A0A
my_project_03b_pristine/Project/settings/MkImage/M= akefile
A=20 =A0=A0
my_project_03b_pristine/Project/settings/hex_to_hex= .exe
A=20 =A0=A0
my_project_03b_pristine/Project/settings/composit.c= mp
A=20 =A0=A0
my_project_03b_pristine/Project/settings/GenCrc.pl<= br>...
A=20 =A0=A0
my_project_03b_pristine/Documentation/Architecture.= docx
A=20 =A0=A0
my_project_03b_pristine/.pydevproject
A=20 =A0=A0
my_project_03b_pristine/Makefile
A=20 =A0=A0
my_project_03b_pristine/.settings
A=20 =A0=A0
my_project_03b_pristine/.settings/org.eclipse.cdt.c= odan.core.prefs
U=20 =A0
my_project_03b_pristine
Checked out revision=20 2577.

user_dude@computer_node~/p= rojects/my_project
$ svn status
svn:=20 warning: W155007: '/cygdrive/D/Users/
user_dude/projec= ts/my_project' is not a=20 working copy

user_dude@computer_node~/projects/my_project
$ cd
my_project_03b_pristine/

user_dude@computer_node~/projects/my_project/= my_project_03b_pristine
$ svn status
D =A0=A0=A0=A0C=20 Project/settings/MkImage
=A0=A0=A0=A0=A0> =A0=A0local unversioned, in= coming add upon=20 update
D =A0=A0=A0=A0=A0=A0Project/settings/MkImage/Makefile
D=20 =A0=A0=A0=A0=A0=A0Project/settings/MkImage/defs.h
D=20 =A0=A0=A0=A0=A0=A0Project/settings/MkImage/main.c
Summary of conflicts:<= br>=A0Tree=20 conflicts: 1

user_dude@computer_node~/projects/my_project/my_project_03b_p= ristine
$

This happens on svn 1.7.9 and 1.7.10, but not 1.7.6, 1.6.13, n= or on TortoiseSVN of the last couple of revs.
$ svn --version
svn, ve= rsion 1.7.9 (r1462340)
=A0=A0 compiled Apr 14 2013, 10:11:47

Copyright (C) 2013 The Apache = Software Foundation.
This software consists of contributions made by man= y people; see the NOTICE
file for more information.
Subversion is ope= n source software, see http://sub= version.apache.org/

The following repository access (RA) modules are available:

* ra= _neon : Module for accessing a repository via WebDAV protocol using Neon.=A0 - handles 'http' scheme
=A0 - handles 'https' sche= me
* ra_svn : Module for accessing a repository using the svn network protocol= .
=A0 - with Cyrus SASL authentication
=A0 - handles 'svn' sc= heme
* ra_local : Module for accessing a repository on local disk.
= =A0 - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using ser= f.
=A0 - handles 'http' scheme
=A0 - handles 'https' = scheme

$ svn --version
svn, version 1.7.10 (r1485443)
=A0=A0 c= ompiled Jun=A0 1 2013, 14:51:22

Copyright (C) 2013 The Apache Software Foundation.
This software con= sists of contributions made by many people; see the NOTICE
file for more= information.
Subversion is open source software, see http://subversion.apache.org/

The following repository access (RA) modules are available:

* ra= _neon : Module for accessing a repository via WebDAV protocol using Neon.=A0 - handles 'http' scheme
=A0 - handles 'https' sche= me
* ra_svn : Module for accessing a repository using the svn network protocol= .
=A0 - with Cyrus SASL authentication
=A0 - handles 'svn' sc= heme
* ra_local : Module for accessing a repository on local disk.
= =A0 - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using ser= f.
=A0 - handles 'http' scheme
=A0 - handles 'https' = scheme


Since I have a workaround (Tortoise= SVN) is there anything I should be concerned about with this revision?
Is this anomaly or artifact going to cause problems for us later= with our current version of SVN?
Is this anomaly or artifact= going to cause problems for us later, when upgrading to a new version of S= VN.
How was this caused?
Is there additional informati= on (property/meta data) that can help pin-point the cause?

Thanks much, take care,
-Jim
--001a11c36b08f5478e04de579e6d--