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 E6FD51004C for ; Thu, 6 Jun 2013 15:06:22 +0000 (UTC) Received: (qmail 50680 invoked by uid 500); 6 Jun 2013 15:06:22 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 50572 invoked by uid 500); 6 Jun 2013 15:06:19 -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 50565 invoked by uid 99); 6 Jun 2013 15:06:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2013 15:06:18 +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 (nike.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; Thu, 06 Jun 2013 15:06:11 +0000 Received: by mail-la0-f51.google.com with SMTP id fq12so2482324lab.38 for ; Thu, 06 Jun 2013 08:05:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=P+fuDlTs+ZDKAgdODKw1JqKiwH6vX07EmmF13bXjhsw=; b=JhagbuRedCpizH/XAE28Z3NiuW5t0r4G8vp0t66AgOR3hz3SHT6d7Ry38xJ+GEuH+F CsIjnD3RKOc69Je8Q82QICRhYINlgV4GIT+xtea7oUkQKhqqdgit3p/eHp63Wp5TvB36 im6p9grOe6N6QvzJQbCWh4H8q/Md+qTFQghHbE/8AbavJhZYl4Us0csKnXuVk0XWLQ+Z 3s49Ds6Um4wK1Bw9Mn/KiZTDK/lcUnSeFQ8TIWmY64ZUBZHllv8+UNVdGUm503EtY2G6 wtK0uZtqy92UMzb0hG2VyRPXu/qcZFf3q43JIAWKZ+gpc70u0NNA6ncMg6j6YxXuMkYc TzFQ== MIME-Version: 1.0 X-Received: by 10.152.6.36 with SMTP id x4mr3400976lax.40.1370531130354; Thu, 06 Jun 2013 08:05:30 -0700 (PDT) Received: by 10.114.58.111 with HTTP; Thu, 6 Jun 2013 08:05:30 -0700 (PDT) In-Reply-To: <1B05D8F50421E24799AE93B03CC284BE01C3905B42@CRPMBX01.corp.cbeyond.net> References: <1B05D8F50421E24799AE93B03CC284BE01C3905B42@CRPMBX01.corp.cbeyond.net> Date: Thu, 6 Jun 2013 11:05:30 -0400 Message-ID: Subject: Re: Tree conflict on Fresh checkout From: James Hanley To: Andrew Reedick Cc: "users@subversion.apache.org" Content-Type: multipart/alternative; boundary=089e013d19202dc06c04de7da55a X-Gm-Message-State: ALoCoQl/urwEyIVyQ03tIeF7N/ACCoYYWK12oTd/LeHlgOhUHsjjgLVOoQoLBOE22K4rUFYxMDAF X-Virus-Checked: Checked by ClamAV on apache.org --089e013d19202dc06c04de7da55a Content-Type: text/plain; charset=ISO-8859-1 So, is there additional information I can provide - would doing a diff on the properties of MkImage show anything useful.. I couldn't see any myself but perhaps there's some flags to get additional detail? On Wed, Jun 5, 2013 at 5:00 PM, Andrew Reedick wrote: > > > > From: James Hanley [mailto:jhanley@dgtlrift.com] > > Sent: Tuesday, June 04, 2013 1:44 PM > > To: users@subversion.apache.org > > Subject: Tree conflict on Fresh checkout > > > > 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 > > > > 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 > > Duh. The 'C' is in the 2nd column, which means there's a conflict with > the properties. However, I'm not sure why you would have a properties > conflict on a checkout in svn 1.7. > > > > --089e013d19202dc06c04de7da55a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
So, is there additional information I can provide - would = doing a diff on the properties of MkImage show anything useful.. I couldn&#= 39;t see any myself but perhaps there's some flags to get additional de= tail?



On Wed, Jun 5, 2013 at 5:00 PM, Andrew Reedick &l= t;Andrew.Re= edick@cbeyond.net> wrote:


> From: James Hanley [mailto:jha= nley@dgtlrift.com]
> Sent: Tuesday, June 04, 2013 1:44 PM
> To: users@subversion.ap= ache.org
> Subject: Tree conflict on Fresh checkout
>
> =A0A =A0=A0 my_project_03b_pristine/Project/settings/MkSharedData.exe<= br> > =A0=A0C my_project_03b_pristine/Project/settings/MkImage
> =A0=A0A my_project_03b_pristine/Project/settings/MkImage/main.c
> =A0=A0A my_project_03b_pristine/Project/settings/MkImage/defs.h
> =A0=A0A my_project_03b_pristine/Project/settings/MkImage/Makefile
> A =A0=A0 my_project_03b_pristine/Project/settings/hex_to_hex.exe
>
> user_dude@computer_node~/projects/my_project/m= y_project_03b_pristine
> $ svn status
> D =A0=A0=A0=A0C Project/settings/MkImage
> =A0=A0=A0=A0=A0> =A0=A0local unversioned, incoming add upon update<= br> > D =A0=A0=A0=A0=A0=A0Project/settings/MkImage/Makefile
> D =A0=A0=A0=A0=A0=A0Project/settings/MkImage/defs.h
> D =A0=A0=A0=A0=A0=A0Project/settings/MkImage/main.c
> Summary of conflicts:
> =A0Tree conflicts: 1

Duh. =A0The 'C' is in the 2nd column, which means there's= a conflict with the properties. =A0However, I'm not sure why you would= have a properties conflict on a checkout in svn 1.7.




--089e013d19202dc06c04de7da55a--