You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Scott Morgan <bl...@blueyonder.co.uk> on 2004/11/23 14:14:39 UTC
Dupe file in repos stops checkout(?)
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?
Scott Morgan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Dupe file in repos stops checkout(?)
Posted by Niels Skou Olsen <ns...@manbw.dk>.
Scott Morgan <bl...@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
Re: Dupe file in repos stops checkout(?)
Posted by Scott Morgan <bl...@blueyonder.co.uk>.
François Beausoleil wrote:
> Scott Morgan wrote:
>
>> 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?
>
>
> Check the FAQ on Subversion's web site:
> http://subversion.tigris.org/
Thanks for the clue, dump->filter->load fixed it.
http://svnbook.red-bean.com/en/1.0/ch05s03.html#svn-ch-5-sect-3.1.3
Quick synopsis to anybody browsing the archive as the manual's guide is
for *nix systems:
Get dump file of repository
WinNT> svnadmin dump c:\path\to\repos > broken.dmp
Filter offending file, note using 'type' instead of 'cat' on a Windows
box. Should report removal of file when done.
WinNT> type broken.dmp | svndumpfilter exclude path/to/resource.h >
fixed.dmp
Move broken repository out of the way (just in case)
WinNT> move c:\path\to\repos c:\path\to\repos.bak
Recreate repository and load back in the fixed dump file
WinNT> svnadmin create c:\path\to\repos
WinNT> type fixed.dmp | svnadmin load c:\path\to\repos
Scott Morgan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Dupe file in repos stops checkout(?)
Posted by François Beausoleil <fb...@ftml.net>.
Scott Morgan wrote:
> 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?
Check the FAQ on Subversion's web site:
http://subversion.tigris.org/
Hope that helps,
François
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org