trafodion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Roman Shaposhnik <ro...@shaposhnik.org>
Subject Re: Migrating code to Apache git -- multiple repos
Date Sat, 30 May 2015 02:05:52 GMT
Great progress! I'll definitely take a look Mon/Tue next week!

Thanks,
Roman.

On Fri, May 29, 2015 at 6:04 PM, Varnau, Steve (Trafodion)
<steve.varnau@hp.com> wrote:
> I have pushed more changes to my traf-merged repo.
>
> * renamed "test" directory to "tests/phx"
> * added "wms" component (master branch only, as it has not been released)
> * added 1.x.x_<component> release tags for applicable components
>
> I did not bother with the 0.x.x release tags.
>
> Feedback, please.
>
> -Steve
>
>> -----Original Message-----
>> From: Varnau, Steve (Trafodion)
>> Sent: Thursday, May 28, 2015 15:42
>> To: dev@trafodion.incubator.apache.org
>> Subject: RE: Migrating code to Apache git -- multiple repos
>>
>> I have a combined repo on github for folks to take a look at.
>>
>>       https://github.com/svarnau/traf-merged
>>
>> The full history of all the repos is there for the three release
>> branches: master, stable/1.0, stable/1.1
>>
>> I restructured the various repos into sub-directories for each of the
>> three branches. Install has only a master branch, so it does not exist
>> in the stable branches.
>>
>> Next I need to put in some key tags. Since the same release tag names
>> were used across repos, combining the repos caused tags to conflict.
>> I'll have to re-name them by repo.
>>
>> -Steve
>>
>> > -----Original Message-----
>> > From: Varnau, Steve (Trafodion)
>> > Sent: Wednesday, May 27, 2015 16:52
>> > To: dev@trafodion.incubator.apache.org
>> > Subject: RE: Migrating code to Apache git -- multiple repos
>> >
>> > Thanks, guys. You've answered my questions. I'll work up a combined
>> > repo structure that we can review.
>> >
>> > -Steve
>> >
>> > > -----Original Message-----
>> > > From: shaposhnik@gmail.com [mailto:shaposhnik@gmail.com] On Behalf
>> > > Of Roman Shaposhnik
>> > > Sent: Wednesday, May 27, 2015 15:54
>> > > To: dev@trafodion.incubator.apache.org
>> > > Subject: Re: Migrating code to Apache git -- multiple repos
>> > >
>> > > On Wed, May 27, 2015 at 2:59 PM, Varnau, Steve (Trafodion)
>> > > <steve.varnau@hp.com> wrote:
>> > > > Sorry, I guess we can merge repos while retaining history. I just
>> > > > had
>> > > not done so before.
>> > >
>> > > I can help with that -- I've done it before.
>> > >
>> > > > Is that the preferred route?
>> > >
>> > > Yes.
>> > >
>> > > > The mechanics for migrating the trafodion code is for a committer
>> > > > to push the current code into the newly created repo?  (When we
>> > > > are ready to pull that switch.)
>> > >
>> > > I'd suggest NOT involving INFRA in the mechanics of repo migration.
>> > > At this point it is not simple enough and that will be kind of tough
>> > > to communicate to ASF INFRA.
>> > >
>> > > What I suggest is this: create a brand new staging repo on GH. Merge
>> > > all the code there. Review the result. And once it looks good do
>> > > everybody just do a git push to ASF repo.
>> > >
>> > > Sounds reasonable?
>> > >
>> > > Thanks,
>> > > Roman.

Mime
View raw message