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

Re: Noob question on tortoise, SVN and managing code

From: Kevin Grover <kevin_at_kevingrover.net>
Date: Fri, 31 Oct 2008 09:52:21 -0700

On Thu, Oct 30, 2008 at 1:05 AM, Microbe <xxxmicrobexxx_at_gmail.com> wrote:

> Hey folks,
>
> I have been using tortoise while developing a website and the site is
> now live.
>
> I am a bit confused on how I keep using SVN and hope someone can help.
>
> There is a live website that I don't want to mess with and a
> development website where I experiment and keep working on the code.
>
> While developing I would just take snapshots on a regular basis so I
> could roll back if I needed to.
>
> How should I manage it now? My confusion is that if I add my dev work
> tot he repository, how do I then get code I am happy with to the site
> without doing an update on my development code. For example, say I am
> up to revision 100 but the work to revision 95 is approved to go live,
> what is the best way to then handle getting that to the site.
>
> My guess is to have a live site directory and a dev directory, commit
> from the dev area and update to the live area, but it all seems a
> little dodgy in keeping the integrity intact...or maybe it is just my
> tenuous grasp on the whole SVN thing.
>
> In fact, I have noticed there is a real lack of info on the whole area
> of managing a live website while still developing it in the
> background. I imagine if you are huge (Flickr etc) you have teams to
> do it, but for individuals or a couple of people working on a project,
> there is little information about the whole topic.
>
> Thanks in advance for any thoughts or comments.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
>
>

Look into branches in the SVN and TSVN manuals. You can do one of these
1) Use a 'branch' for the official version, develop elsewhere (trunk for
example) then merge changes into the branch when you want them to be
official
2) Use the 'trunk' for the official version, develop in branches, then merge
to the trunk

I would probably use 2 on small projects and 1 on large projects (more
developers and larger interaction base)

You can then just make the live web site a WC of either you branch or trunk
(depending upon which way you go), then have a cron job (scheduled task) or
a hook script to update it for you.

Look at the log files for larger projects (TSVN, Apache, ....) to see how
they organize things.

- Kevin
Received on 2008-10-31 17:52:33 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.