WeBWorK Main Forum

problem switching to SVN

Re: problem switching to SVN

by Lars Jensen -
Number of replies: 3
Hi Jason,

Thanks for help.

This worked fine for the pg directory, but when I did this for webwork2, e.g. when I did

svn switch http://svn.webwork.maa.org/system/branches/rel-2-4-patches/webwork2

I got this error:

svn: Failed to add file 'clients/webwork_xmlrpc_inc.pl': an unversioned file of the same name already exists

If I delete clients/webwork_xmlrpc_inc.pl svn runs a little longer, but then produces this error:

svn: Failed to add file 'conf/templates/math/math.css': an unversioned file of the same name already exists

If I remove this file, it runs longer yet, but then complains similarly about another file...

Lars.
In reply to Lars Jensen

Re: problem switching to SVN

by Jason Aubrey -
Hi Lars,

The problem is that those files
clients/webwork_xmlrpc_inc.pl
conf/templates/math/math.css
etc do not exist in the trunk.

For example, Mike has rewritten much of the webservice stuff in clients. And that math.css file actually belongs in htdocs/css/

When you converted from cvs rel-2-4-patches to svn trunk using rsync, the rsync program simply ignored those files, and the .svn directory that came with trunk would contain no information about those files since it wasn't pulled down with your checkout.

In other words, rsync didn't delete it and Subversion doesn't know anything about it (and so calls it 'unversioned').

Fixing this should be as easy as including --force with your switch command, as in

svn switch --force http://svn.webwork.maa.org/system/branches/rel-2-4-patches/webwork2

Let me know if you have any other trouble. Sorry for not anticipating this...

Jason
In reply to Jason Aubrey

Re: problem switching to SVN

by Lars Jensen -
Hi Jason,

Thanks! The --force flag took care of the problem for out test server. Now I can login without any errors.

Now on to the production server:

Is this the correct way to switch the production server and stay with patches?

svn co http://svn.webwork.maa.org/system/branches/rel-2-4-patches/webwork2 temp-checkout
rsync -a temp-checkout/ /path/to/webwork2 directory/
rm -rf temp-checkout

and the same for the pg directory, right?
Lars.
In reply to Lars Jensen

Re: problem switching to SVN

by Jason Aubrey -
That'll do it! You'll also need to switch your NationalProblemLibrary directory, but with trunk since that is not branched. (Well, there are branches, but those are for authors who are building new collections to add to the NPL.)

(And there have recently been *a lot* of bug fixes in the NPL, thanks to Arnie and Mike's student Spyro. And be sure to run NPL-update to get recently added problems into you database.)

Jason