On Dec 6, 2007 9:39 AM, Thufir <hawat.thufir@gmail.com> wrote:
> I think that this works, but I may be doing it in a weird way. Normally,
> of course, I won't be deleting directories. Does it matter the path
> where I am when I make the commit? That is, ~/foo versus ~/foo/rss-on-
> rails versus ~/foo/rss-on-rails/config/ and so forth? for any of those
> it will figure itself out?
>
> thufir_at_arrakis ~/Desktop/foo $ svn checkout https://rss-on-
> rails.googlecode.com/svn/trunk/rss-on-rails --username hawat.thufir
> A rss-on-rails/test
> A rss-on-rails/test/unit
> A rss-on-rails/test/unit/item_test.rb
>
According to this, you've got your Rails project imported one directory too
deep. rss-on-rails is IN trunk, when it should BE trunk.
Basically, you shouldn't be checking out
https://rss-on-rails.googlecode.com/svn/trunk/rss-on-rails, you should check
out https://rss-on-rails.googlecode.com/svn/trunk and your Rails directories
should be in there.
It's not a big deal, really: it's only convenience/best-practice.
If you want to fix it, you can do something like this (make sure you have a
copy of your Rails project in ~/rails):
thufir@arrakis ~/Desktop/foo/ $ svn checkout
https://rss-on-rails.googlecode.com/svn/trunk --username hawat.thufir .
thufir@arrakis ~/Desktop/foo/ $ cd trunk
thufir@arrakis ~/Desktop/foo/trunk/ $ svn rm rss-on-rails
thufir@arrakis ~/Desktop/foo/trunk/ $ svn ci -m "Removing erroneous
rss-on-rails directory." .
thufir@arrakis ~/Desktop/foo/trunk/ $ cp -R ~/rails/* .
thufir@arrakis ~/Desktop/foo/trunk/ $ ls -al
total 68
-rw-r--r-- 1 thufir users 9102 Dec 6 07:34 README
-rw-r--r-- 1 thufir users 307 Dec 6 07:34 Rakefile
drwxr-xr-x 7 thufir users 4096 Dec 6 07:33 app
drwxr-xr-x 3 thufir users 4096 Dec 6 07:34 components
drwxr-xr-x 4 thufir users 4096 Dec 6 07:34 config
drwxr-xr-x 4 thufir users 4096 Dec 6 07:34 db
drwxr-xr-x 3 thufir users 4096 Dec 6 07:34 doc
drwxr-xr-x 4 thufir users 4096 Dec 6 07:34 lib
drwxr-xr-x 3 thufir users 4096 Dec 6 07:33 log
drwxr-xr-x 6 thufir users 4096 Dec 6 07:34 public
drwxr-xr-x 5 thufir users 4096 Dec 6 07:34 script
drwxr-xr-x 8 thufir users 4096 Dec 6 07:33 test
drwxr-xr-x 7 thufir users 4096 Dec 6 07:33 tmp
drwxr-xr-x 4 thufir users 4096 Dec 6 07:34 vendor
thufir@arrakis ~/Desktop/foo/trunk/ $ svn ci -m "Importing trunk." .
Now you'll have your source in trunk, and you can check it out thusly:
thufir@arrakis ~/Projects/rss-on-rails/ $ svn checkout
https://rss-on-rails.googlecode.com/svn/trunk --username hawat.thufir .
Then, do whatever work you want on the source in ~/Projects/rss-on-rails,
commit your changes and they'll go into trunk.
--
Mando
P.S. I whole-heartedly recommend the suggestion of the SVN book. It can
really help sort out some of these ideas and keep you on the right track.
Received on Thu Dec 6 16:58:33 2007