[Jython-checkins] SF.net SVN: jython:[6048] trunk/sandbox

[<th...@us...>]

Revision: 6048
          http://jython.svn.sourceforge.net/jython/?rev=6048&view=rev
Author:   thobes
Date:     2009-02-24 22:39:22 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Setting up a sandbox for easier maintanance of the "advanced" compiler.
See README.txt for more information.

Added Paths:
-----------
    trunk/sandbox/tobias/
    trunk/sandbox/tobias/.hg/
    trunk/sandbox/tobias/.hg/patches/
    trunk/sandbox/tobias/.hg/patches/series
    trunk/sandbox/tobias/.hg/requires
    trunk/sandbox/tobias/.hg/store/
    trunk/sandbox/tobias/.hgignore
    trunk/sandbox/tobias/README.txt
    trunk/sandbox/tobias/compiler/


Property changes on: trunk/sandbox/tobias
___________________________________________________________________
Added: svn:externals
   + jython	https://jython.svn.sourceforge.net/svnroot/jython/trunk/jython



Property changes on: trunk/sandbox/tobias/.hg
___________________________________________________________________
Added: svn:ignore
   + *



Property changes on: trunk/sandbox/tobias/.hg/patches
___________________________________________________________________
Added: svn:ignore
   + status


Added: trunk/sandbox/tobias/.hg/requires
===================================================================
--- trunk/sandbox/tobias/.hg/requires	                        (rev 0)
+++ trunk/sandbox/tobias/.hg/requires	2009-02-24 22:39:22 UTC (rev 6048)
@@ -0,0 +1,3 @@
+revlogv1
+store
+fncache


Property changes on: trunk/sandbox/tobias/.hg/store
___________________________________________________________________
Added: svn:ignore
   + *


Added: trunk/sandbox/tobias/.hgignore
===================================================================
--- trunk/sandbox/tobias/.hgignore	                        (rev 0)
+++ trunk/sandbox/tobias/.hgignore	2009-02-24 22:39:22 UTC (rev 6048)
@@ -0,0 +1,4 @@
+\.svn/
+\.hgignore$
+README.txt$
+compiler

Added: trunk/sandbox/tobias/README.txt
===================================================================
--- trunk/sandbox/tobias/README.txt	                        (rev 0)
+++ trunk/sandbox/tobias/README.txt	2009-02-24 22:39:22 UTC (rev 6048)
@@ -0,0 +1,21 @@
+This sandbox contains Tobias projects. Most notably the "advanced" compiler.
+
+Here double version control systems are used. Subversion is used at the base.
+All sub projects are managed in subversion. The main Jython code is linked
+using svn:externals.
+Mercurial is used for managing patches on the main Jython code.
+For this to work a few things needs to be maintained:
+ * The .hgignore file should contain all subprojects. Only linked code should
+   be visible to mercurial.
+ * Subversion is set to ignore everything in the .hg directory except for the
+   patches directory where Mercurial Patch Queues on the main Jython code goes.
+ * When starting a new working copy all the files needs to be added to hg,
+   this is because the entire hg repository is NOT stored in subversion,
+   only the patches.
+
+Hopefully this setup will decrease the overhead of branch management. This by
+eliminating the need for merges from trunk, since there is no branch. And
+making merge back a simple commit (with patches applied).
+
+Further information about each sub project can be found in the README files
+in the directory for each sub project respectively.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.