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, 04 Jun 2013 19:12:00 GMT
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
<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
> >
> > 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?
>
>
>

Mime
View raw message