Date: 2004-08-18T09:03:12
Editor: AdamJack <[EMAIL PROTECTED]>
Wiki: Gump Wiki
Page: GumpBranches
URL: http://wiki.apache.org/gump/GumpBranches
no comment
New Page:
= Gump SVN *Active* Branches =
Gump maintains (currently) two branches '''trunk''' (it's main working branch, used by
the test flavour) and '''live''' which is used for live public runs (public and jdk15
flavours).
= Upgrading "live" =
{{{
mkdir work
cd work
svn checkout https://svn.apache.org/repos/asf/gump/trunk/ gump-trunk
svn checkout https://svn.apache.org/repos/asf/gump/live gump-live
cd gump-trunk
svn info # Note: store the revision number of the last change, i.e. R1.
cd ../gump-live
svn info # Note: store the revision number of the last change, i.e. R2.
svn merge -r R2:R1 https://svn.apache.org/repos/asf/gump/trunk/
svn commit # Updated live...
}}}
Note: since we *never* work in live, only in trunk ... (1) R2 <= R1 (2) No merge
conflicts ought occur.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
