Subject: Re: [boost] [website] beta vs. live website
From: Eric Niebler (eric_at_[hidden])
Date: 2010-11-12 10:25:49
On 11/12/2010 3:32 AM, Daniel James wrote:
> On 12 November 2010 04:15, Rene Rivera <grafikrobot_at_[hidden]> wrote:
>> Originally live was a "branch" of beta, i.e. it was an "svn copy". But I
>> guess I use a different definition than svn uses. I mean do a diff between
>> them and copy over the changes you think are appropriate. Personally I use
>> winmerge to do this. As I don't trust the "automated" merge features of any
>> VC system.
> I do and it saves a lot of effort. Whenever anyone copies content
> across I manually add the merge information to keep it up to date.
Oh. I copies requirements.html over by hand before I saw this. Sorry.
-- Eric Niebler BoostPro Computing http://www.boostpro.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk