subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From James Hanley <jhan...@dgtlrift.com>
Subject Re: Tree conflict on Fresh checkout
Date Tue, 11 Jun 2013 20:12:17 GMT
Is there any additional detail I can provide for this?


On Thu, Jun 6, 2013 at 11:05 AM, James Hanley <jhanley@dgtlrift.com> wrote:

> 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 <Andrew.Reedick@cbeyond.net
> > 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.
>>
>>
>>
>>
>

Mime
View raw message