harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Yang Paulex" <paulex.y...@gmail.com>
Subject Re: [classlib][general]Sync casslib trunk and Java 6 branch
Date Tue, 05 Jun 2007 12:47:26 GMT
Done at r544465, now the Java 6 branch is synced with trunk@r544450.

2007/6/4, Yang Paulex <paulex.yang@gmail.com>:
>
>
>
> 2007/6/4, Yang Paulex <paulex.yang@gmail.com>:
> >
> >
> >
> > 2007/6/4, Mikhail Loenko <mloenko@gmail.com>:
> > >
> > > Hi Paulex,
> > >
> > > +1 for 1). Agree that, common mods should go to 5.0
> > >
> > > I don't have strict preference at the moment wrt 2)
> > >
> > > As for 3) I think manual work is unavoidable, let's better
> > > first see how it works, and then decide
> > >
> > > And thanks for volunteering!
> >
> >
> > OK, so I'll go for that from tomorrow.
> >
> > But for the first time today, if no one objects, I'd like recreate the
> > Java 6 branch from trunk@544143 instead of merging them, because there
> > are only 3 commits to Java 6 branch since it was created, while there are
> > thousands of commits in trunk, so it's much easier to recreate the branch
> > and apply that three changes, than to merge the thousands.
> >
>
> Forgot to mention,  I'm going to  move the old Java6 branch to
> classlib/archives/java6
>
> Thanks,
> > > Mikhail
> > >
> > >
> > > 2007/6/4, Yang Paulex < paulex.yang@gmail.com>:
> > > > Hi, All
> > > >
> > > > I'd like to start to look at classlib in Java 6 recently, before
> > > committing
> > > > anything, I wanted to discuss sync issue at first. There are several
> > > issues
> > > > here:
> > > >
> > > > 1. How to sync trunk(Java 5) and Java 6 branch
> > > >
> > > > Merge from trunk to Java 6 branch is necessary, because the Java 5
> > > work is
> > > > still in progress, so most bug fixing work makes senses for Java 6
> > > branch.
> > > > On the other hand, from Java 6 branch to trunk is not necessary.
> > > "svn merge"
> > > > can help a lot here, some other decentralized version control system
> > > like
> > > > svk[1] may be more powerful, but I'd propose we start from
> > > basic  tool here
> > > > to see if everything is OK.
> > > >
> > > > I'd propose the steps below to merge it:
> > > >
> > > > cd <java 6 working copy>
> > > > svn merge -r
> > > >
> > > https://svn.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-merge
> > > > https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk@
> > > <REVISION>
> > > > <resolve conflict if there are some>
> > > > ant build
> > > > ant test
> > > > <verify everything is OK>
> > > > svn commit -m "merge from trunk@REVISION to java 6 branch"
> > > > svn copy -r REVISION
> > > > https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk
> > > >
> > > https://svn.apache.org/repos/asf/harmony/enhanced/classlib/tags/latest-merge
> > > >
> > > > One SVN tag - latest-merge - needs to be created as a snapshot of
> > > trunk
> > > > merged last time, so that committer doesn't need to record the
> > > revision
> > > > number every time.
> > > >
> > > > 2. How frequently should the merge be performed?
> > > >
> > > > I'd like to say "as frequent as possible", but the effort is too
> > > much. Maybe
> > > > daily merge is a reasonable trade-off.
> > > >
> > > > 3. Should this be automatically?
> > > >
> > > > Sure, although some kind of manually work is unavoidable when
> > > conflicts
> > > > happen.  But I'd like to try it for several times until we are sure
> > > it's
> > > > safe to make it automatically.
> > > > I'm volunteer to perform the daily merge before that if no one
> > > objects.
> > > >
> > > > Your comments are highly appreciated.
> > > >
> > > > [1] http://svk.bestpractical.com/view/HomePage, a decentralized
> > > > <http://en.wikipedia.org/wiki/Version_control_system >version
> > > control system
> > > > written in Perl based on SVN, with a design comparable BitKeeper and
> > > Git
> > > > --
> > > > Paulex Yang
> > > > China Software Development laboratory
> > > > IBM
> > > >
> > >
> >
> >
> >
> > --
> > Paulex Yang
> > China Software Development laboratory
> > IBM
> >
>
>
>
> --
> Paulex Yang
> China Software Development laboratory
> IBM
>



-- 
Paulex Yang
China Software Development laboratory
IBM

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message