Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] [egit-dev] Fwd: [technology-pmc] FYI: Policy on new releases joining SR
On Mon, Aug 19, 2013 at 8:31 AM, Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:
On Mon, Aug 19, 2013 at 2:12 AM, Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:
On Sun, Aug 18, 2013 at 4:42 PM, Robin Stocker <robin@xxxxxxxxx> wrote:
> Due to this new policy I wasn't aware of until this week we cannot
> ship JGit and EGit 3.1 with Kepler SR1 since RC1 already passed.

That's unfortunate. What are our plans for SR2? Ship 3.2, 3.1 or
another 3.0.x?

I think we could ship 3.2 (planned for Dec) with SR2. RC1 for SR2 is due
mid of Jan 2014 
 
> Hence I propose we ship a pure maintenance release 3.0.x with SR1
> and ship 3.1 independently of the release train through our own
> p2 repository.

Sounds good.

> Speak up if you have a different proposal.
>
> Any changes which should go with the maintenance release for SR1
> need to be pushed for branch stable-3.0. If there are new patches
> on this branch I will simply create 3.0.x maintenance releases for
> the RCs for SR1, find the SR1 schedule here [1]. Last build for SR1
> is on Sept 18 (we are in +3 slot of the schedule).
>
> Let me know if there are any important patches which already reached
> master which you want also on 3.0.x.

I think the following commits should be on stable-3.0, ordered in
cherry-pick order:

JGit:

https://git.eclipse.org/c/jgit/jgit.git/commit/?id=98dd6e6abdba75d05f03b5b073659efe53182dc6
https://git.eclipse.org/c/jgit/jgit.git/commit/?id=4b1f368033a6978e3cadd68f840586ab9bc4c538

EGit:

https://git.eclipse.org/c/egit/egit.git/commit/?id=862e6ff22ad56c10df6de3385ffa4c7d02363d1d
https://git.eclipse.org/c/egit/egit.git/commit/?id=d09bab183cb4f497b3bdbd5d651a3b655ff2ea23
https://git.eclipse.org/c/egit/egit.git/commit/?id=eb5c41459d5d185871b5253610255e6f1242c9ad
https://git.eclipse.org/c/egit/egit.git/commit/?id=61f74a5e184c4851fb10bc1efabaf363f55d9f12
https://git.eclipse.org/c/egit/egit.git/commit/?id=cb94e50dcd5f8f473938a82ba47f43f2a3e487f2
https://git.eclipse.org/c/egit/egit.git/commit/?id=da70c4047ea0fd7cdd42a7af800d3876bf8f60da
https://git.eclipse.org/c/egit/egit.git/commit/?id=c65156b5205beb3179abcc11ae47c4110e36ad5f
https://git.eclipse.org/c/egit/egit.git/commit/?id=5a60d9ee49f8ae4a63a6b9f5243f596d0d96a4ba
https://git.eclipse.org/c/egit/egit.git/commit/?id=94fb639496f53183ebda495a01b61d663f453de8
https://git.eclipse.org/c/egit/egit.git/commit/?id=26859b5fccffb76dfa49cbdca281748c5df8fc0f

Should I cherry-pick and push to Gerrit or do you want to push them
without going through Gerrit?

I started working on cherry-picking fixes to stable-3.0. SInce we now need CLAs for all
contributed fixes we need to wait for Alex to sign the CLA in order to cherry-pick

I cherry-picked bugfixes from master for 3.0.x:

next I will also cherry-pick patches for egit 3.0.x but first I need to fix the current
problem with egit tests [1] using test folders under user home which is on NFS on
our new Hudson server. Otherwise the gerrit validation job would vote -1 for
all newly uploaded changes (including the cherry-picked patches).

I cherry-picked the following fixes to stable-3.0 for 3.0.2 and updated the corresponding bugs
to list 3.0.2 as target milestone:

JGit
--------------------------------
patches cherry-picked for 3.0.2:
    99d981c - 2013-08-21, Robin Rosenberg : Update reflog like C Git during rebase (non-interactive)
    bd57789 - 2013-08-21, Christian Halstrick : Make sure checkout is not deleting folders outside the workingtree
    ab4ade4 - 2013-08-21, Matthias Sohn : Update to Jetty 7.6.11.v20130520
    c128100 - 2013-08-21, Robin Stocker : Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter
    c222b18 - 2013-08-21, Robin Stocker : Refactor PathSuffixFilterTest to remove duplication
    781b0b5 - 2013-08-21, Hiroshi Tomita : Check parentFile is not null
    27c1c51 - 2013-08-21, Hiroshi Tomita : Update HEAD in cherry-picking several commits
    81db591 - 2013-08-21, Alex Rukhlin : Fix HTTP response processing for WWW-Authenticate headers
    bbea37a - 2013-08-21, Dave Borowitz : Don't skip want validation when the client sends no haves
    8a7f486 - 2013-08-21, Robin Rosenberg : Fix tests for OS X when the tmpdir is the default /tmp
    423f722 - 2013-08-21, Robin Rosenberg : Fix running maven http tests on OS X
    ec2202f - 2013-08-21, Robin Rosenberg : Recognize CRLF when parsing the short message of a commit or tag
    4b41b68 - 2013-08-21, Matthias Sohn : Update build to use Tycho 0.18
    f94b258 - 2013-08-21, Matthias Sohn : Add jgit target platform to define dependencies more precisely

updated target milestone to 3.0.2 of the following bugs:
    
EGit
--------------------------------
patches done for 3.0.2:
    d4aae79 - 2013-08-23, Robin Stocker : Improve usability of "Create New Tag" dialog
    fdc286a - 2013-08-23, Matthias Sohn : Lookup keybinding used to trigger content assist

patches cherry-picked for 3.0.2
    7138906 - 2013-08-23, Matthias Sohn : Decorate repositories view logo
    ce535de - 2013-08-23, Robin Stocker : [repoView] Make "Delete Repository..." more explicit
    03d533c - 2013-08-23, Robin Stocker : Make sure Comparator implementation does not violate contract
    77944d1 - 2013-08-23, Robin Stocker : Fix NPE in CommitMessageComponent#setDefaults
    52ad32e - 2013-08-23, Robin Stocker : [repoView] Ask whether to remove/delete repo when pressing Delete
    d01c215 - 2013-08-23, Robin Stocker : Fix instability in MergeToolTest
    cf80bc9 - 2013-08-23, Robin Stocker : Don't automatically connect projects in /, /home or /home/username
    50feacd - 2013-08-23, Robin Stocker : Extract method in AutoShareProjects to reduce nesting
    230cce6 - 2013-08-23, Robin Stocker : Extend labels of sources in Import Projects from Git
    b8e2c5f - 2013-08-23, Laurent Goubet : Fix potential NPE from passing null as progress monitor
    cfbf8f5 - 2013-08-23, Christian Georgi : Consider IResource.getLocation() being null
    d4e6dda - 2013-08-23, Robin Stocker : Fix scheduling rule error when ignoring resources in nested projects
    8a0dd9f - 2013-08-23, Matthias Sohn : Update build to use Tycho 0.18
    9eda752 - 2013-08-23, Matthias Sohn : Update target platform to use Jetty 7.6.11
    1c1168a - 2013-08-23, Stephen Elsemore : Fix NPE when selecting filediff in a merge commit
    b979ed0 - 2013-08-23, Stephen Elsemore : Auto share multiple projects in single job
    227edde - 2013-08-23, Matthias Sohn : Fix version.sh to correctly modify dependencies

updated target milestone to 3.0.2 of the following bugs:

--
Matthias

Back to the top