[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: teaching your boss version control

From: Alan <alan_at_ufies.org>
Date: 2004-08-31 18:02:42 CEST

On Tue, Aug 31, 2004 at 05:55:56PM +1200, Michael Stevens wrote:
> > 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 guess mostly it is keeping changes between dev and live branches
minimul, but me being in charge of merging changes from live to dev
branches makes more sense than going the other way...

> I wouldn't want to try and teach any non-programmer how to merge files from
> a dev branch into the live branch.

You don't want to :) Not fun.

> 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.

/me notes new staging server on ground beside him.

Guess I should get that set up and going sometime soon huh? :)

> 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.

Good thoughts, thanks.

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

Mac/linux shop here, and everyone is happy with ssh and vim for getting
into the servers and making changes, but a good suggestion :)

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
Received on Tue Aug 31 17:59:13 2004

This is an archived mail posted to the Subversion Users mailing list.