RE: teaching your boss version control

> 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

What is wrong with that solution (boss fixes stuff in live branch)? Seems
to me to be the simplest, and to cause your boss the least amount of grief.
I wouldn't want to try and teach any non-programmer how to merge files from
a dev branch into the live branch.

At my place of work, I maintain three working copies of our web site on
different servers. The dev server contains the dev branch - generally, only
I work on this. The staging and live servers contain the current trunk
branch. Changes are made by two non-programmers on the staging server, and
once they are happy and have previewed their changes in a browser, they 'svn
commit' their changes on staging, and 'svn update' the live server. No
manual changes are made to the live server except in unusual circumstances.

I am responsible for maintaining the dev branch and perform merges between
the branches as necessary. Generally I don't work on the dev machine, but
maintain local working copies on my workstation - only updating dev for
testing and let my team members preview new changes.

Hope that helps. Also, if you are on Win32, giving your boss TortoiseSVN
should make him happier :)

--
Michael
The views expressed in this email and any accompanying attachments do not necessarily reflect those of Te Puni Kokiri.  Te Puni Kokiri does not accept any responsibility whatsoever for any loss or damage that may result from reliance on or the use of the information contained in this email or any accompanying attachments.
This email together with any accompanying attachments may be confidential and subject to legal privilege.  It may be read, copied and used only by the intended recipient(s).  If you have received this message in error, please notify the sender immediately by return email, telephone or facsimile and delete this message. You may not copy, disclose or use the contents in any way.  Thank you.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org