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

Re: Local copy incorrectly checks in to two different branches

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 21 Jan 2009 09:45:52 +0000

2009/1/21 Charles Worm <charles.worm_at_gmail.com>:
> I have a 1.0 and 1.1 branch of a project. The 1.1 branch is new and
> has also been relocated to a different server.

Woah, stop right there. You can't have branches from the same
repository on different servers. A repository lives on one server
only. You cannot copy between repositories and you can't keep two
active repositories in sync.

> Anyway, something has
> gone wrong and when I check in changes from my local copy to the 1.1
> branch, some file end up in the in the 1.0 branch in a completely
> wrong folder (fortunately is the wrong folder and I was able to delete
> them without worrying about what they had overwritten).
>
> The everything is ok on my local copy but I suspect some of my .svn
> files on my local copy are messed up. So I would like to refresh the
> svn information on my local copy so I can commit correctly.
>
> I know I can export my local copy to create a clean detached copy of
> the project, but how can I reattach that back to the SVN repository?
> I suspect this would correct my problem but am not sure of what side
> effects their might be.

Checkout a fresh working copy. If you export and re-import you lose
all your history.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1040789
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-21 10:46:10 CET

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