You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by James Hanley <jh...@dgtlrift.com> on 2013/06/04 19:43:37 UTC
Tree conflict on Fresh checkout
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
Re: Tree conflict on Fresh checkout
Posted by Shahid khan <sl...@gmail.com>.
On Jun 5, 2013 5:13 PM, "James Hanley" <jh...@dgtlrift.com> wrote:
> I'm using Google Apps Mail... but I think I've set it to plain-text.
>
> user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> $ svn ls -v Project/settings | grep -i mkimage
> 2528 cm_user May 30 19:28 MkImage/
> 2528 cm_user 64131 May 30 19:28 MkImage.exe
>
> user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> $
>
>
>
> On Tue, Jun 4, 2013 at 3:28 PM, Andrew Reedick <An...@cbeyond.net>
> wrote:
> >
> > > From: James Hanley [mailto:jhanley@dgtlrift.com]
> > > Sent: Tuesday, June 04, 2013 3:12 PM
> > > To: Andrew Reedick
> > > Cc: users@subversion.apache.org
> > > Subject: Re: Tree conflict on Fresh checkout
> > >
> > > I can reproduce on the versions specified above of the CygWin svn
> client within CygWin, but I haven't tried the native windows svn client.
> Strange thing is that this is only an issue with MkImage, and
> MkSharedData...
> > >
> > > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> > > $ svn ls -v Project/settings
> > > 2528 cm_user May 30 19:28 ./
> > >...
> > > 2528 cm_user May 30 19:28 MkBinFile/
> > > 2528 cm_user May 30 19:28 MkImage/
> > > 2528 cm_user 64131 May 30 19:28 MkImage.exe
> > > 2528 cm_user May 30 19:28 MkSharedData/
> > > 2528 cm_user 59528 May 30 19:28 MkSharedData.exe
> > >...
> > > 2209 cm_user 85 May 07 12:52 run.cmd
> > >
> > > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> > > $
> >
> >
> > 'svn ls' sorts output and the sort is case sensitive. Since you
> truncated your output, we can't tell if you have a case sensitive filename
> problem. Run 'svn ls -v Project/settings | grep -i mkimage' to see if you
> have duplicate "mkimage" entries.
> >
> >
> > Under 1.7.9, I get a tree conflict when I have "alpha" and "Alpha" in
> the same dir under Cygwin.
> > $ svn ls -v svn://localhost/test/case
> > 111 test Jun 04 15:18 ./
> > 111 test Jun 04 15:18 Alpha/
> > 110 test Jun 04 15:18 alpha/
> >
> > $ svn co svn://localhost/test/case
> > A case/Alpha
> > C case/alpha
> > Checked out revision 111.
> >
> > $ svn status case
> > D C case/alpha
> > > local unversioned, incoming add upon update
> > Summary of conflicts:
> > Tree conflicts: 1
> >
> >
> > Finally, if you're using Outlook, when composing an email for the list,
> click Options -> Plain Text.
> >
> >
>
Re: Tree conflict on Fresh checkout
Posted by James Hanley <jh...@dgtlrift.com>.
I'm using Google Apps Mail... but I think I've set it to plain-text.
user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
$ svn ls -v Project/settings | grep -i mkimage
2528 cm_user May 30 19:28 MkImage/
2528 cm_user 64131 May 30 19:28 MkImage.exe
user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
$
On Tue, Jun 4, 2013 at 3:28 PM, Andrew Reedick <An...@cbeyond.net>
wrote:
>
> > From: James Hanley [mailto:jhanley@dgtlrift.com]
> > Sent: Tuesday, June 04, 2013 3:12 PM
> > To: Andrew Reedick
> > Cc: users@subversion.apache.org
> > Subject: Re: Tree conflict on Fresh checkout
> >
> > I can reproduce on the versions specified above of the CygWin svn
client within CygWin, but I haven't tried the native windows svn client.
Strange thing is that this is only an issue with MkImage, and
MkSharedData...
> >
> > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> > $ svn ls -v Project/settings
> > 2528 cm_user May 30 19:28 ./
> >...
> > 2528 cm_user May 30 19:28 MkBinFile/
> > 2528 cm_user May 30 19:28 MkImage/
> > 2528 cm_user 64131 May 30 19:28 MkImage.exe
> > 2528 cm_user May 30 19:28 MkSharedData/
> > 2528 cm_user 59528 May 30 19:28 MkSharedData.exe
> >...
> > 2209 cm_user 85 May 07 12:52 run.cmd
> >
> > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> > $
>
>
> 'svn ls' sorts output and the sort is case sensitive. Since you
truncated your output, we can't tell if you have a case sensitive filename
problem. Run 'svn ls -v Project/settings | grep -i mkimage' to see if you
have duplicate "mkimage" entries.
>
>
> Under 1.7.9, I get a tree conflict when I have "alpha" and "Alpha" in the
same dir under Cygwin.
> $ svn ls -v svn://localhost/test/case
> 111 test Jun 04 15:18 ./
> 111 test Jun 04 15:18 Alpha/
> 110 test Jun 04 15:18 alpha/
>
> $ svn co svn://localhost/test/case
> A case/Alpha
> C case/alpha
> Checked out revision 111.
>
> $ svn status case
> D C case/alpha
> > local unversioned, incoming add upon update
> Summary of conflicts:
> Tree conflicts: 1
>
>
> Finally, if you're using Outlook, when composing an email for the list,
click Options -> Plain Text.
>
>
RE: Tree conflict on Fresh checkout
Posted by Andrew Reedick <An...@cbeyond.net>.
> From: James Hanley [mailto:jhanley@dgtlrift.com]
> Sent: Tuesday, June 04, 2013 3:12 PM
> To: Andrew Reedick
> Cc: users@subversion.apache.org
> Subject: Re: Tree conflict on Fresh checkout
>
> I can reproduce on the versions specified above of the CygWin svn client within CygWin, but I haven't tried the native windows svn client. Strange thing is that this is only an issue with MkImage, and MkSharedData...
>
> user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> $ svn ls -v Project/settings
> 2528 cm_user May 30 19:28 ./
>...
> 2528 cm_user May 30 19:28 MkBinFile/
> 2528 cm_user May 30 19:28 MkImage/
> 2528 cm_user 64131 May 30 19:28 MkImage.exe
> 2528 cm_user May 30 19:28 MkSharedData/
> 2528 cm_user 59528 May 30 19:28 MkSharedData.exe
>...
> 2209 cm_user 85 May 07 12:52 run.cmd
>
> user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
> $
'svn ls' sorts output and the sort is case sensitive. Since you truncated your output, we can't tell if you have a case sensitive filename problem. Run 'svn ls -v Project/settings | grep -i mkimage' to see if you have duplicate "mkimage" entries.
Under 1.7.9, I get a tree conflict when I have "alpha" and "Alpha" in the same dir under Cygwin.
$ svn ls -v svn://localhost/test/case
111 test Jun 04 15:18 ./
111 test Jun 04 15:18 Alpha/
110 test Jun 04 15:18 alpha/
$ svn co svn://localhost/test/case
A case/Alpha
C case/alpha
Checked out revision 111.
$ svn status case
D C case/alpha
> local unversioned, incoming add upon update
Summary of conflicts:
Tree conflicts: 1
Finally, if you're using Outlook, when composing an email for the list, click Options -> Plain Text.
Re: Tree conflict on Fresh checkout
Posted by James Hanley <jh...@dgtlrift.com>.
I can reproduce on the versions specified above of the CygWin svn client
within CygWin, but I haven't tried the native windows svn client. Strange
thing is that this is only an issue with MkImage, and MkSharedData...
user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
$ svn ls -v Project/settings
2528 cm_user May 30 19:28 ./
...
2528 cm_user May 30 19:28 MkBinFile/
2528 cm_user May 30 19:28 MkImage/
2528 cm_user 64131 May 30 19:28 MkImage.exe
2528 cm_user May 30 19:28 MkSharedData/
2528 cm_user 59528 May 30 19:28 MkSharedData.exe
...
2209 cm_user 85 May 07 12:52 run.cmd
user_dude@computer_node ~/projects/my_project/my_project_03b_pristine
$
On Tue, Jun 4, 2013 at 2:22 PM, Andrew Reedick
<An...@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
> >
> > 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.
> >
> > $ 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
>
> Any chance it's a case issue, i.e. MkImage versus mkimage in the same dir?
> Do an 'svn ls Project/settings'.
>
> And are you using a Windows svn client in a cygwin bash shell, or the
> cygwin built svn client?
>
>
>
RE: Tree conflict on Fresh checkout
Posted by Andrew Reedick <An...@cbeyond.net>.
> 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
>
> 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.
>
> $ 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
Any chance it's a case issue, i.e. MkImage versus mkimage in the same dir? Do an 'svn ls Project/settings'.
And are you using a Windows svn client in a cygwin bash shell, or the cygwin built svn client?
Re: Tree conflict on Fresh checkout
Posted by James Hanley <jh...@dgtlrift.com>.
Is there any additional detail I can provide for this?
On Thu, Jun 6, 2013 at 11:05 AM, James Hanley <jh...@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.
>>
>>
>>
>>
>
Re: Tree conflict on Fresh checkout
Posted by James Hanley <jh...@dgtlrift.com>.
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
<An...@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.
>
>
>
>
RE: Tree conflict on Fresh checkout
Posted by Andrew Reedick <An...@cbeyond.net>.
> 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.