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

Re: Noob has it fubar'd - any hope?

From: Nick Stolwijk <nick_stolwijk_at_planet.nl>
Date: 2007-04-04 00:14:48 CEST

First, you don't have to uninstall anything. Normally you have a few things:

1. Subversion installed on your client.
This means you have the svn executable, which you can use to handle your
working copies.

2. Subversion installend on your server.
This means you have the svnadmin and the svnserve executables, which you
can use to handle your repositories and serve your repositories. (Mind,
this can be the same installation as 1, meaning you can have the
repositories and working copies on the same machine, only not at the
same location on one machine. Bear with me, I'll try to explain).

3. One or more Subversion repositories.
Normally, one repository for each project, with a trunk, multiple
branches and multiple tags. This is the place where all version history
is kept. You never edit any files in this location. (Never say never,
but be very careful about it.) You can manage this location through the
svnadmin command and serve it through the svnserve command.

4. One or more working copies.
For each repository you can have multiple working copies. (ie. one
working copy of the trunk, one working copy of a branch and one working
copy of your latest tag). In this directories you can work (except, of
course, in the tag working copy) and manage the checkins, updates,
reverts, etc through the svn executable.

Note the difference between 3 and 4. As I understand your question, you
have misunderstood subversion and 3 and 4 are the same location for you.
I guess you can try some things (First, make a backup of your repository
directory, so you can try multiple solutions):

1. Easiest way, but losing your history.
Take a copy of your sources and remove every trace of .svn directories.
Your source is now the latest version, without any binding to
subversion. You can create a repository (3), create the basic layout
(trunk, branches, tags), make a working copy through svn checkout (4),
copy your sources to the WC (working copy, 4), and add and commit
everything to your repository (3).

Hmm, come to think of it, I don't know if it is possible to retrieve
your history. :( Maybe someone else can come with a way to retrieve it,
but hopefully my mail gives you a better understanding of WC versus
repository and a way to start all over. Please ask further questions if
you have them.

Hth,

Nick Stolwijk

Bill Walton wrote:
> Hi Ryan,
>
> Ryan Schmidt wrote:
>
>> Um... well...
>>
>> I see no reason to throw out the repository you now have. If its
>> layout isn't the way you want it, you can easily move things around
>> within the repository to achieve your desired layout. And the
>> repository history will track all that so you'll have a record of it
>> later, which is always a good thing.
>>
>> Unless you have things in multiple repositories. Since it sounds like
>> this is a single project, it probably makes more sense to put it in a
>> single repository. If we find it's in multiple repositories, then
>> you may want to "svnadmin dump" things out of the secondary
>> repositories and "svnadmin load" them into whatever you decide is
>> the main repository.
>>
>> First you need to find out how many repositories you have and where
>> they are.
>
>> Or possibly when you said "Explorer" you meant Windows Explorer,
>
> Yes I meant Windows Explorer. Sorry for the lack of clarity.
>
>> and you're just referring to the way in which TortoiseSVN integrates
>> with Windows Explorer.
>
> I guess that's what's going on. When I use Windows Explorer to copy a
> directory that SVN/TortiseSVN 'knows about', the copy has the
> TortiseSVN marking just like the original.
>
>> If so, then that doesn't tell us anything about how your repository
>> is served or where it is. The start of the URL will tell us though.
>> What's the URL through which you access your repository? Does it
>> start with file:///? If so, that points directly to the repository.
>
> The repository(ies) is (are) on my local disk. I've only accessed
> it/them through TortiseSVN.
>
>> If you can't remember your repository URL, use "svn info" on your
>> working copy.
>
> And it turns out I haven't been working with working copies. I've
> been editing the files in the repository directory(ies) and then
> committing them. Told you it was fubar ;-p
>
>> I believe the equivalent using TortoiseSVN would be to show the
>> Properties window in Windows Explorer, then click the TortoiseSVN tab.
>
> The Properties dialog has a Subversion tab. To illustrate using two
> of the source files: The actor.rb (model) file shows a URL of
> file:///C:/svnrepos/emrec-base/trunk/app/models/actor.rb and tells me
> it's at Revision 47. The actor_controller file shows a URL of
> file:///C:/svnrepos/emrec-base/trunk/app/controllers/actor_controller.rb
> and tells me it's at Revision 46. An associated view file shows
> file:///C:/svnrepos/emrec-base/trunk/app/views/actor/edit_patient.rhtml
> and is at Revision 56.
>
> Then there's the allergy views... They don't show a Subversion tab in
> the Properties dialog. So I used Add in TortiseSVN which it appears
> to do by putting a little blue '+' on the file icon. Then I tried SVN
> commit which yields...
>
> Adding:
> InstantRails-1.5\rails_apps\emrec-base\app\views\allergy\edit.rhtml
> Error: Commit failed (details follow):
> Error: File already exists: filesystem 'C:/svnrepos/db', transaction
> '77-1', path '/emrec-base/trunk/app/views/allergy/edit.rhtml'
>
>> There's no reason to uninstall the Subversion software.
>
> Might it, given the depth of the hole I've so obvoiusly dug myself
> into, not be the quickest way out?
>
>> It sounds like you may not have understood Subversion when you
>> started 6 months ago,
>
> You have a true gift for understatement. Thanks for being so gentle ;-)
>
>> and would now like to do it right.
>
> Oh yes.
>
>> Have you read the book? If not, I highly recommend it, as it explains
>> everything. http://svnbook.org/ .
>
> Yesterday I picked up the copy of "Pragmatic Version Control" that I
> bought six months ago and have since been reading and scratching my
> head, trying to figure out how to start over. Does the svnbook cover
> this ground (i.e., how to un-fubar your repository)? Given what you
> can tell from the above, do you have any suggestions on the easiest
> route I can take to get this straightened out?
>
> Thanks much,
> Bill
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 4 00:15:24 2007

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