On 11/11/2010 9:58 PM, Eric Niebler wrote:
On 11/11/2010 9:55 PM, Rene Rivera wrote:
On 11/11/2010 8:35 PM, Eric Niebler wrote:
On 11/11/2010 9:26 PM, Eric Niebler wrote:
The inspect tool has been updated.
I'd like to update boost's developer guidelines (http://www.boost.org/development/requirements.html) to reflect the changes to the inspect tool. In the website's svn repository, I see two directories: public_html/beta and public_html/live. Which do I change, and what's the procedure for keeping these two in sync?
Like library coding..
1. Update the beta first, and make sure it looks and functions OK. 2. Merge to live, and make sure that looks OK.
By "merge" you mean just copy it, right? These aren't branches.
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. -- -- Grafik - Don't Assume Anything -- Redshift Software, Inc. - http://redshift-software.com -- rrivera/acm.org (msn) - grafik/redshift-software.com -- 102708583/icq - grafikrobot/aim,yahoo,skype,efnet,gmail