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

[TSVN] A merge after erronoeusly switch gives also "Cannot replace adirectory from within"

From: Alf Christophersen <alf.christophersen_at_medisin.uio.no>
Date: 2005-10-11 17:58:00 CEST

At 17:32 11.10.2005, Matthias Wächter wrote:
>Sorry, another answer...
>Stefan Küng schrieb:
>><b>ATTENTION:</b> Only use the Relocate command if the original
>>repository has moved to a new URL.\nIf you use Relocate to direct your
>>working copy to another repository or branch,\nthis <b>will corrupt your
>>working copy!</b>\nTo associate your working copy with another branch,
>>use the Switch command.\nAre you sure you want to relocate?

After having used switch, but switch from wrong directory (a subdirectory
of the working project directory) and now trying to switch back again to
the trunc, I also get the same error message :-(

I had a main project (stupid organisation, but that was what I was told to
do the first time):

c:/delp that is contained in file:///x:/svn-repos/delp6/trunc

I wanted to test Delphi 2005 on one of the delphi 5 dpr files contained in
subdirectory ActiReg32 and made a branch
file:///x:/svn-repos/delp6/branch/ActiCalc_2005 and then did a branch to
that directory. It then started to delete all versioned files from my
working directory on C-disk until it suddenly crashed with message that
folder \delp6\actireg32\Pos\Data was in use by another process (only
possible was itself since no other processes was running).

Now I have managed to move back most by using merge. But, something remains.

A big problem is now that:

Due to merge message in lower left side of page:
C:\Delp6 is now bound to file:///x:/svn-repos/delp6/branch/Actireg_2005

C:\Delp6\Actireg32 is bound to file:///x:/svn-repos/delp6/trunc and thus
only a sub

How and what do I switch, in order to have my project pointing back to
trunc, with all files in place? Trunc now contain a few files being also a
part of the file:///x:/svn-repos/delp6/branch/Actireg_2005/Actireg32 folder.

A Merge of the content of
file:///x:/svn-repos/delp6/branch/Actireg_2005/Actireg32 revision 240 (the
intact source) to the trunc also gives the message above. Why ??

Alf Christophersen

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

Received on Tue Oct 11 16:59:11 2005

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