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

Re: Dupe file in repos stops checkout(?)

From: Niels Skou Olsen <nso_at_manbw.dk>
Date: 2004-11-23 16:01:25 CET

Scott Morgan <blumf@blueyonder.co.uk> writes:

> I think I've been caught out by not paying attention and Windows illiterate
> file sysytem. I can't checkout a project because of the following error:
>
> ...other files...
> A src\clients\Designer2\Resource.h
> A src\clients\Designer2\resource.h
> svn: In directory 'src/clients/Designer2'
> svn: Can't copy
> src/clients/Designer2/.svn/tmp/text-base/resource.h.svn-base' to
> src/clients/Designer2/resource.h.tmp': The system cannot find the file
> specified.
>
> It seems I've commited two copies of resource.h to the repos (different
> caps) and this is confusing svn. how do I go about resolving this? Delete
> the offending file and commit, leaving the current revision as a dud? Or is
> a better approach available?

How about a server side rename of one of the files:

  svn mv SRC_URL DST_URL

Then you can checkout and fix the problem (maybe Resource.h and resource.h
needs to be merged), and finally delete one of them.

Best regards,
Niels

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 23 16:04:03 2004

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