[Jython-checkins] SF.net SVN: jython: [4927] branches/advanced/

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

Revision: 4927
          http://jython.svn.sourceforge.net/jython/?rev=4927&view=rev
Author:   thobes
Date:     2008-07-14 06:32:52 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-4926" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/asm
I believe that svnmerge will work on the advanced branch from now on.
As I learn more about svnmerge it migh have been possible to get the merging
to work before, if I had specified the revision from where the branching
occured manually, that could have saved us revision 4923, but as stated in my
last commit message the manual merge process was fairly simple.
I have configured it to only be able to pull in changes from the asm branch,
so if changes are made on trunk, these need to go through the asm branch before
going into the advanced branch. I think this is ok, since 1. the asm branch is
where things are happening, 2. the advanced branch is not about keeping up to
date with the 2.5 development of Jython, but to explore advanced compiling
strategies in Jython, it is however important to not lose compatibility with
Jython 2.5, which is why it makes sense to keep up to date with at least the
asm branch, and 3. if/when the asm branch is merged back onto trunk it is
very possible to redirect the advanced branch to merge from there instead,
this should be particularly easy if the advanced branch is kept up to date with
the asm branch.

Revision Links:
--------------
    http://jython.svn.sourceforge.net/jython/?rev=4923&view=rev

Property Changed:
----------------
    branches/advanced/


Property changes on: branches/advanced
___________________________________________________________________
Name: svnmerge-integrated
   + /branches/asm:1-4926


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