> From: James Hanley [mailto:jhan...@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?