User story

I'm sure I'm getting myself confused but I'm struggling to get these scripts working properley. I'd like to get some clarification on how my user story would work.

I'm using the latest git check out of the scripts on drupal 6.13. I have a live site that is checked into svn. I have dbscripts installed and functioning.

On the live site I execute the following:

dump.php
dump.php development
dump.php last-merge

I use the following natty command line to add the new files to the svn repository:

for x in `svn status|grep "^?"|awk '{print $2}'`; do svn add $x; done

I check it in

svn ci

On a dev server I check out the code, create a databse user and excute

restore.php production min

W00t it all wrks I have moved the DB onto the dev server. Now I mae some config changes, I alter view on the dev server. I also add some content on the production server. I now execute the following on the dev server.

dump.php development

I use the following with update my files in svn (the first line is as above the second remoces and files that have been deleted)

for x in `svn status|grep "^?"|awk '{print $2}'`; do svn add $x; done
for x in `svn status|grep "^\!"|awk '{print $2}'`; do svn rm $x; done

I check it all in:

svn ci

I know ssh back onto the production server and svn up. I think I know have a production, last-merge and new development db on the live server. What should be executed now?
Should I have merged on the dev server?
Which restore command should I use?

Can you help me get this use story right please? I'll write it up when it's done.

Thanks t.