This conversation exploded while I was away.

Quote Originally Posted by aaarrrggh View Post
Well you're the first person I've known to say that.
Ditto, but the opposite.

Quote Originally Posted by aaarrrggh View Post
Regarding my other question - have you experienced branching in git and/or mercurial?
Yup. I first learned distributed VCS with Mercurial, and I used Git on a project about a year ago.

Quote Originally Posted by aaarrrggh View Post
Can you describe the process of branching in svn? Let's say you take my first scenario - the example of having two weeks' worth of changes that are unfinished, and then you're asked to add a new "reporting" section to the live site. Can you describe the actual process for branching and merging in svn?
If you were making intermediate commits during those two weeks, then you would have created a branch right from the get go. Once your feature is ready to go live, you can merge that branch into the trunk. Not much else process to describe here. The merge would complete automagically.

Quote Originally Posted by aaarrrggh View Post
I'll do the same in mercurial.

So you update to the live branch:

hg update live

you branch from this point:

hg branch reports

You can then commit on the branch as normal.

When it's time to merge, you go to your live branch:

hg update live

and merge:

hg merge reports

Done.

What's the subversion process?
Literally exactly the same. Branch from the trunk. Commit to the branch as normal. When it's time to merge, just run merge. Done.