[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict on Fresh checkout

From: James Hanley <jhanley_at_dgtlrift.com>
Date: Wed, 5 Jun 2013 07:42:09 -0400

I'm using Google Apps Mail... but I think I've set it to plain-text.

user_dude_at_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_at_computer_node ~/projects/my_project/my_project_03b_pristine
$

On Tue, Jun 4, 2013 at 3:28 PM, Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
wrote:
>
> > From: James Hanley [mailto:jhanley_at_dgtlrift.com]
> > Sent: Tuesday, June 04, 2013 3:12 PM
> > To: Andrew Reedick
> > Cc: users_at_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_at_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_at_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.
>
>
Received on 2013-06-05 13:43:12 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.