[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: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-04-05 08:21:03 CEST

On Apr 3, 2007, at 16:44, Bill Walton wrote:

>> 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.

You mustn't use Windows Explorer to copy any file or directory that
Subversion knows about. Doing so would confuse Subversion. If you
have been doing this at any point since starting to use Subversion,
your working copy is probably in a very weird state -- with local
directories that link to places in the repository that they should
not link to.

>> 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

Well, if you've been committing, then you've been using a working
copy. There is no other way to commit (other than "importing", which
it doesn't sound like you've been doing).

>> 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?

Uninstalling the Subversion and/or TortoiseSVN software will not help
you in any way, because your repositories and working copies will be
left exactly the way they are, so the next time you install
Subversion and/or TortoiseSVN you will still have the same problem.

>> 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?

Oh yes, I'm sorry, you mentioned you got the hardcopy book. I'm sure
that's fine. I just habitually refer people to the online book that
way people don't have to go out and buy a physical one.

-------------------

I'm still not sure what your situation is. Let me make another guess.
6 months ago, you decided to start using Subversion, and created a
repository and imported some code into it and checked out a working
copy. Perhaps, since that time, you have not used Subversion to
commit your changes?

I recommend you check to see what repositories you have, and what's
in them. From the URLs you posted above, it sounds like either you
have a single repository C:\svnrepos, or you have a directory C:
\svnrepos which contains multiple repositories, such as emrec-base.
So, navigate to C:\svnrepos in Windows Explorer and see what's in
there. If it contains README.txt, conf, dav, db, format, hooks and
locks, then it is a repository. If it contains a directory emrec-
base, then emrec-base is probably the repository. (Check its contents
for the aforementioned 7 items.) If there are other directories in C:
\svnrepos, check to see if they are repositories as well.

Now that you know where your repositories are, you can use the
TortoiseSVN repository browser to browse the repositories. See if
they contain everything you've been working on. Or, you can check out
a working copy of each repository to a new location, then examine the
contents of the working copy to see if everything in it is as it
should be. If things are missing from the repositories, you could go
back to the working copies you already have to see if there are
uncommitted changes that you can commit, or if the data is otherwise
still in those repositories and could now be added to the repositories.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 5 08:21:41 2007

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