[yocto] merging eclipse-poky-juno & eclipse-poky-kepler

Minchev, Todor todor.minchev at intel.com
Wed Feb 25 06:42:06 PST 2015 

On Wed, 2015-02-25 at 14:17 +0000, Flanagan, Elizabeth wrote:
> On 25 February 2015 at 13:12, Minchev, Todor <todor.minchev at intel.com> wrote:
> > Hello,
> >
> > I just wanted to check if anyone is using the Yocto ADT Eclipse plug-in
> > from the eclipse-poky repo here:
> >
> > http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky/
> >
> > This repo hasn't been maintained for a couple of years. The most
> > up-to-date code for the ADT plug-ins for Eclipse Juno & Kepler can be
> > found in these two repos.
> >
> > http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-juno/
> > http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-kepler/
> >
> > We have decided to merge the two repos above and maintain the plug-in
> > under the original eclipse-poky repo for all versions of Eclipse.
> > In other words, we are planning to overwrite eclipse-poky with the merge
> > result from eclipse-poky-juno and eclipse-poky-kepler.
> >
> > I am planning to do this on Friday, 27 Feb 2015. If anyone has any
> > objections please let me know before then.
> >
> 
> My only concern is that we:
> 
> - maintain history

All history is preserved. 

> - get autobuilder changes in when the merge is done
> 
> If you could explain the eventual layout of the new merged repo, that
> would be grand.

All branches and tags from the eclipse-poky-kepler and eclipse-poky-juno
repositories will be reachable with the same branch/tag names and the
kepler or juno prefix respectively. 

The development(master) branches for juno, kepler and luna are:

juno-master
kepler-master
luna-master
master - tracks the master branch for the latest supported Eclipse
release (luna-master at present) 

This is the repo structure after the merge:

  Branches  

  juno-master
  juno/1.1_M1
  juno/1.1_M2
  juno/1.1_M4
  juno/1.2_M1
  juno/1.2_M2
  juno/1.2_M3
  juno/1.2_M4
  juno/1.3_M1
  juno/1.3_M2
  juno/1.3_M3
  juno/1.3_M4
  juno/1.3_M5
  juno/1.3_beta
  juno/1.4_M1
  juno/1.4_M3
  juno/1.4_M4
  juno/1.4_M5
  juno/daisy
  juno/danny
  juno/denzil
  juno/dizzy
  juno/dora
  juno/dylan
  juno/edison
  kepler-master
  kepler/daisy
  kepler/dizzy
  kepler/dora
* luna-master
  master

Tags

juno/1.1_M1.rc1
juno/1.1_M1.rc2
juno/1.1_M2.final
juno/1.1_M2.rc1
juno/1.1_M2.rc3
juno/1.1_M3.final
juno/1.1_M3.rc3
juno/1.1_M4.rc2+
juno/1.1_M4.rc4
juno/1.2_M1.final
juno/1.2_M1.rc1
juno/1.2_M1.rc2
juno/1.2_M2.final
juno/1.2_M2.rc1
juno/1.2_M3.final
juno/1.2_M3.rc1
juno/1.2_M4.rc1
juno/1.2_M4.rc4
juno/1.2_M4.rc4.0
juno/1.3
juno/1.3.2
juno/1.3.2.final
juno/1.3_M1.final
juno/1.3_M2.final
juno/1.3_M2.rc1
juno/1.3_M3.final
juno/1.3_M3.rc2
juno/1.3_M4.final
juno/1.3_M4.rc1
juno/1.3_M5.rc1
juno/1.3_M5.rc2
juno/1.3_M5.rc3
juno/1.3_M5.rc4
juno/1.4.1.rc1
juno/1.4_M1.final
juno/1.4_M1.rc1
juno/1.4_M3.final
juno/1.4_M3.rc1
juno/1.4_M3.rc2
juno/1.4_M4.final
juno/1.4_M4.rc1
juno/1.4_M5.final
juno/1.4_M5.rc1
juno/1.4_M5.rc2
juno/1.4_M5.rc3
juno/1.4_M6.rc1
juno/1.5_M1.final
juno/1.5_M1.rc1
juno/1.5_M2.rc1
juno/1.5_M3
juno/1.5_M3.final
juno/1.5_M3.rc1
juno/1.5_M4
juno/1.5_M4.final
juno/1.5_M4.rc1
juno/1.5_M4.rc2
juno/1.5_M4.rc3
juno/1.5_M5.rc1
juno/1.5_M5.rc2
juno/1.5_M5.rc3
juno/1.5_M5.rc4
juno/1.5_M5.rc5
juno/1.5_M5.rc6
juno/1.5_M5.rc7
juno/1.5_M5.rc8
juno/1.6_M1
juno/1.6_M1.final
juno/1.6_M1.rc1
juno/1.6_M2
juno/1.6_M3
juno/1.6_M3.final
juno/1.6_M4
juno/bernard-5.0
juno/daisy-11.0.0
juno/daisy-11.0.1
juno/daisy-11.0.2
juno/danny-8.0.1
juno/danny-8.0.2
juno/denzil-7.0
juno/denzil-7.0.0
juno/denzil-7.0.1
juno/denzil-7.0.1_rc2
juno/denzil-7.0.2
juno/dizzy-12.0.0
juno/dizzy-12.0.1
juno/dora-10.0.0
juno/dora-10.0.1
juno/dora-10.0.1.final
juno/dora-10.0.2
juno/dora-10.0.3
juno/dora-10.0.4
juno/dylan-9.0.0
juno/dylan-9.0.1
juno/dylan-9.0.1.rc1
juno/dylan-9.0.2
juno/dylan-9.0.2.rc1
juno/dylan-9.0.3
juno/dylan-9.0.4
juno/edison-6.0
juno/edison-6.0.1
juno/edison-6.0.1.final
juno/edison-6.0.1.release
juno/edison-6.0.2
juno/edison-6.0.2_rc1
juno/poky-10.0.0.final
juno/poky-10.0.1
juno/poky-10.0.1.final
juno/yocot-1.4.2
juno/yocto-1.4.1
juno/yocto-1.4.2
juno/yocto-1.4.2.rc1
juno/yocto-1.4.3
juno/yocto-1.4.4
juno/yocto-1.5
juno/yocto-1.5.1
juno/yocto-1.5.1.final
juno/yocto-1.5.2
juno/yocto-1.5.3
juno/yocto-1.5.4
juno/yocto-1.5.final
juno/yocto-1.5_M5.rc2
juno/yocto-1.6
juno/yocto-1.6.1
juno/yocto-1.6.2
juno/yocto-1.7
juno/yocto-1.7.1
juno/yocto_1.5_M5.rc8
kepler/1.5_M3
kepler/1.5_M3.final
kepler/1.5_M3.rc1
kepler/1.5_M4
kepler/1.5_M4.final
kepler/1.5_M4.rc1
kepler/1.5_M4.rc2
kepler/1.5_M4.rc3
kepler/1.5_M5.rc1
kepler/1.5_M5.rc2
kepler/1.5_M5.rc3
kepler/1.5_M5.rc4
kepler/1.5_M5.rc5
kepler/1.5_M5.rc6
kepler/1.5_M5.rc7
kepler/1.5_M5.rc8
kepler/1.6_M1
kepler/1.6_M1.final
kepler/1.6_M1.rc1
kepler/1.6_M2
kepler/1.6_M3
kepler/1.6_M3.final
kepler/1.6_M4
kepler/daisy-11.0.0
kepler/daisy-11.0.1
kepler/daisy-11.0.2
kepler/dizzy-12.0.0
kepler/dizzy-12.0.1
kepler/dora-10.0.0
kepler/dora-10.0.1
kepler/dora-10.0.1.final
kepler/dora-10.0.2
kepler/dora-10.0.3
kepler/dora-10.0.4
kepler/poky-10.0.0.final
kepler/poky-10.0.1
kepler/poky-10.0.1.final
kepler/yocto-1.5
kepler/yocto-1.5.1
kepler/yocto-1.5.1.final
kepler/yocto-1.5.2
kepler/yocto-1.5.3
kepler/yocto-1.5.4
kepler/yocto-1.5.final
kepler/yocto-1.5_M5.rc2
kepler/yocto-1.6
kepler/yocto-1.6.1
kepler/yocto-1.6.2
kepler/yocto-1.7
kepler/yocto-1.7.1
kepler/yocto_1.5_M5.rc8


Branches hidden from the cgit browser:

juno/
└── heads
    ├── ADT_helios
    ├── JunoSSH
    ├── JunoTCF
    ├── jzhang
    │   ├── kepler-build
    │   ├── remote-adt
    │   └── windows-build
    ├── lke
    │   ├── indigo
    │   └── prompt_version
    ├── llu
    │   └── ssh
    ├── master
    ├── master-indigo
    └── release
        ├── 0.9
        ├── 1.0
        └── m2

kepler/
└── heads
    ├── jzhang
    │   ├── consolidate-remote
    │   └── consolidate-remote2
    ├── master
    └── remote-refactor

--Todor 

> 
> Other than those concerns, I'm fine with the merge.
> 
> > Thanks,
> >
> > Todor
> >
> >
> > --
> > _______________________________________________
> > yocto mailing list
> > yocto at yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/yocto
> >
> 
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5229 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20150225/665d0e9b/attachment.bin>

More information about the yocto mailing list