teaching your boss version control

Hi folks. I have svn up and going and working great for the two
branches of code, dev and live. However, the boss is back from vacation
and now he's a) excited about having version control finally in and
working and b) clueless as to how to use it properly.

Basically the set up is a bunch of online content that is mostly the
same through dev and live, but dev has new code and is potentially
unstable (though right now they are basically the same).

What we used to do was just log into the live server, make a change, and
save. Very bad, but very easy, and the boss could go in and make
spelling changes, fixes to link, edit content, etc just fine.

Now the procedure is more like this:
 - edit on dev server, add files there, check in
 - move to local "live" branch checkout on dev server, run complicated
   log/diff/merge commands (as described in chapter four of the svn
   book:
   http://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.1)
 - check in changes, fight when the 'svn copy' command doesn't bring
   files over as you expect, bitch and whine at employee (that'd be me)
   to fix it. If files are added into the dev branch and then you use
   svn copy svn://blah . and try to check in the results aren't as one
   might expect from looking at the command
 - check in changes properly

Not an ideal solution. I know that we're not using branching completely
as intended, and small fixups should be done in the live tree instead of
dev and then merging, but the fact remains that I need to either
 - teach the boss how to do it better
 - find a better way of using and setting svn for the
   multi-developer+boss environment.

Any suggestions for folks that have come across this problem? Are there
any helper scripts to do the nitty gritty work, or should I figure a
better way of doing the repository setup? Any pointers to webpages
describing good version control setup and rules or procedures for
dealing with working with version control would be much appreciated.

No, telling the boss he's not allowed to fix things anymore is not an
option :)

TIA

alan

-- 
Alan <alan_at_ufies.org> - http://arcterex.net
--------------------------------------------------------------------
"There are only 3 real sports: bull-fighting, car racing and mountain 
climbing. All the others are mere games."                -- Hemingway
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org