'Re: [Dev] Merge kernel patch fixes with Git repo'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wsf-javascript-dev
Subject:    Re: [Dev] Merge kernel patch fixes with Git repo
From:       Kishanthan Thangarajah <kishanthan () wso2 ! com>
Date:       2014-02-27 11:40:22
Message-ID: CABK5VoqzMeWTFTzM_jRWB2ksh-zz4MN+EmopQNzAHiSf8vy7Zw () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

Here are the steps that you will be following (Fork & Pull model). This
will be common to all dev repos.

1. Fork the relevant dev repo.
2. Fix the issue.
3. Send the fix as a pull request :
https://help.github.com/articles/creating-a-pull-request
4. The pull will the be reviewed by the respective team, which owns the
repo and be merged.

In here the relevant dev repo will vary on the your fix. Eg: If your fix is
for axis2 the you will use the axis2 dev-repo :
https://github.com/wso2-dev/wso2-axis2

This is because, the dependencies (eg : axis2, axiom, etc) are now treated
as separate projects.

On Thu, Feb 27, 2014 at 11:44 AM, Manoj Kumara <manoj@wso2.com> wrote:

> Hi All,
> 
> Since now that we have the kernel dev repository available [1], and the
> current development trunk will be this repository.
> 
> During creating the git repository Eranda has merged changes up
> to patch0005 along with the process. So please merge all the
> fixes relevant to patch0006 and any other fixes relevant to kernel can be
> pushed there.
> 
> Here is the currently applied patch list. The contributor relevant to the
> below fixes need to push there changes to the dev repo ASAP.
> 
> https://wso2.org/jira/browse/IDENTITY-2019 - \
> Aselahttps://wso2.org/jira/browse/CARBON-14651  - \
> ManjulaRhttps://wso2.org/jira/browse/CARBON-14654  - \
> AmilaDhttps://wso2.org/jira/browse/ESBJAVA-2051  - \
> Ashansahttps://wso2.org/jira/browse/CARBON-14677  - \
> KasunGhttps://wso2.org/jira/browse/CARBON-14565  - \
> Chanikahttps://wso2.org/jira/browse/ESBJAVA-3010  - \
> GayanChttps://wso2.org/jira/browse/ESBJAVA-1614  - \
> Dinushahttps://wso2.org/jira/browse/IDENTITY-2044 - \
> Darshanahttps://wso2.org/jira/browse/CARBON-14704  - Ajanthan 
> 
> [1] https://github.com/wso2-dev/carbon4-kernel
> 
> Thanks,
> Manoj
> 
> 
> *Manoj Kumara*
> Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94713448188
> 
> 
> On Wed, Feb 19, 2014 at 5:50 PM, Kishanthan Thangarajah <
> kishanthan@wso2.com> wrote:
> 
> > 
> > 
> > 
> > On Wed, Feb 19, 2014 at 5:36 PM, Sameera Jayasoma <sameera@wso2.com>wrote:
> > 
> > > Hi Manoj,
> > > 
> > > Yes we need a patching strategy for Git based Carbon 4 codebase. The
> > > solution will come into act once the 4.3 release is done. I think we can
> > > use the existing kernel patching strategy. But we need to figure our a
> > > proper Git branching mechanism. e.g. maintaining  a branch for a kernel
> > > patch and once the release is done, merge the patch branch with the master.
> > > 
> > 
> > We can follow the same process we planned other repos/products. The fixes
> > can be send as pull requests to the kernel dev repo (not to the main repo).
> > So if some wants to patch kernel, they can do so via this process. Kernel
> > team will check this pull request and merge it with the dev repo.
> > 
> > Once we plan on releasing a kernel patch, then we can send these fixes as
> > pull requests to main repo [1]. When it is successfully merged, we can
> > create a branch for that patch and do the release.
> > 
> > 
> > > Sameera.
> > > 
> > > 
> > > On Tue, Feb 18, 2014 at 10:41 AM, Manoj Kumara <manoj@wso2.com> wrote:
> > > 
> > > > Hi,
> > > > 
> > > > Since we are now maintaining Carbon 4.x kernel on Git what will be the
> > > > best way to do the $Subject for . Should we merge the changes at the time
> > > > of the patch get released as a step of the release process. Otherwise there
> > > > can be more pull requests if we merge with Git for every kernel fix.
> > > > 
> > > > WDYT ?
> > > > 
> > > > 
> > > > [1] https://github.com/wso2/carbon4-kernel
> > > > 
> > > > 
> > > > *Manoj Kumara*
> > > > Software Engineer
> > > > WSO2 Inc. http://wso2.com/
> > > > *lean.enterprise.middleware*
> > > > Mobile: +94713448188
> > > > 
> > > 
> > > 
> > > 
> > > --
> > > Sameera Jayasoma,
> > > Architect,
> > > 
> > > WSO2, Inc. (http://wso2.com)
> > > email: sameera@wso2.com
> > > blog: http://sameera.adahas.org
> > > twitter: https://twitter.com/sameerajayasoma
> > > flickr: http://www.flickr.com/photos/sameera-jayasoma/collections
> > > Mobile: 0094776364456
> > > 
> > > Lean . Enterprise . Middleware
> > > 
> > 
> > 
> > 
> > --
> > *Kishanthan Thangarajah*
> > Senior Software Engineer,
> > Platform Technologies Team,
> > WSO2, Inc.
> > lean.enterprise.middleware
> > 
> > Mobile - +94773426635
> > Blog - *http://kishanthan.wordpress.com
> > <http://kishanthan.wordpress.com>*
> > Twitter - *http://twitter.com/kishanthan <http://twitter.com/kishanthan>*
> > 
> 
> 

-- 
*Kishanthan Thangarajah*
Senior Software Engineer,
Platform Technologies Team,
WSO2, Inc.
lean.enterprise.middleware

Mobile - +94773426635
Blog - *http://kishanthan.wordpress.com <http://kishanthan.wordpress.com>*
Twitter - *http://twitter.com/kishanthan <http://twitter.com/kishanthan>*

[Attachment #5 (text/html)]

<div dir="ltr">Here are the steps that you will be following (Fork &amp; Pull model). \
This will be common to all dev repos.<div><br></div><div>1. Fork the relevant dev \
repo.</div><div>2. Fix the issue.</div><div>3. Send the fix as a pull request : <a \
href="https://help.github.com/articles/creating-a-pull-request" \
target="_blank">https://help.github.com/articles/creating-a-pull-request</a></div>

<div>4. The pull will the be reviewed by the respective team, which owns the repo and \
be merged.</div><div><br></div><div>In here the relevant dev repo will vary on the \
your fix. Eg: If your fix is for axis2 the you will use the axis2 dev-repo : <a \
href="https://github.com/wso2-dev/wso2-axis2" \
target="_blank">https://github.com/wso2-dev/wso2-axis2</a></div>

<div><br></div><div>This is because, the dependencies (eg : axis2, axiom, etc) are \
now treated as separate projects.<br></div><div><br></div></div><div \
class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Feb 27, 2014 at 11:44 \
AM, Manoj Kumara <span dir="ltr">&lt;<a href="mailto:manoj@wso2.com" \
target="_blank">manoj@wso2.com</a>&gt;</span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><div>Hi All,</div><div><br></div><div><font \
face="arial, sans-serif">Since now that we have the kernel dev repository available \
[1], and the current development trunk will be this repository. </font></div>

<div>

<font face="arial, sans-serif"><br></font></div><div><font face="arial, \
sans-serif">During creating the git repository Eranda has merged changes up to \
patch0005 along with the process. So please merge all the fixes relevant to patch0006 \
and any other fixes relevant to kernel can be pushed there.</font></div>

<div><font face="arial, sans-serif"><br></font></div><div><font face="arial, \
sans-serif">Here is the currently applied patch list. The contributor relevant to the \
below fixes need to push there changes to the dev repo ASAP.</font></div>

<div><font face="arial, sans-serif"><br></font></div><div><pre \
style="white-space:pre-wrap;word-wrap:break-word"><a \
href="https://wso2.org/jira/browse/IDENTITY-2019" \
target="_blank">https://wso2.org/jira/browse/IDENTITY-2019</a> - Asela <a \
href="https://wso2.org/jira/browse/CARBON-14651" \
target="_blank">https://wso2.org/jira/browse/CARBON-14651</a>  - ManjulaR <a \
href="https://wso2.org/jira/browse/CARBON-14654" \
target="_blank">https://wso2.org/jira/browse/CARBON-14654</a>  - AmilaD <a \
href="https://wso2.org/jira/browse/ESBJAVA-2051" \
target="_blank">https://wso2.org/jira/browse/ESBJAVA-2051</a>  - Ashansa <a \
href="https://wso2.org/jira/browse/CARBON-14677" \
target="_blank">https://wso2.org/jira/browse/CARBON-14677</a>  - KasunG <a \
href="https://wso2.org/jira/browse/CARBON-14565" \
target="_blank">https://wso2.org/jira/browse/CARBON-14565</a>  - Chanika <a \
href="https://wso2.org/jira/browse/ESBJAVA-3010" \
target="_blank">https://wso2.org/jira/browse/ESBJAVA-3010</a>  - GayanC <a \
href="https://wso2.org/jira/browse/ESBJAVA-1614" \
target="_blank">https://wso2.org/jira/browse/ESBJAVA-1614</a>  - Dinusha <a \
href="https://wso2.org/jira/browse/IDENTITY-2044" \
target="_blank">https://wso2.org/jira/browse/IDENTITY-2044</a> - Darshana <a \
href="https://wso2.org/jira/browse/CARBON-14704" \
target="_blank">https://wso2.org/jira/browse/CARBON-14704</a>  - \
Ajanthan</pre></div><div><span \
style="font-family:arial,sans-serif;font-size:12.727272033691406px"><br>

</span></div><div>

<span style="font-family:arial,sans-serif;font-size:12.727272033691406px">[1] \
</span><a href="https://github.com/wso2-dev/carbon4-kernel" \
target="_blank">https://github.com/wso2-dev/carbon4-kernel</a></div><div><br></div>

<div>Thanks,<br>

Manoj</div>
</div><div class="gmail_extra"><div class=""><br clear="all"><div><div \
dir="ltr"><div><br></div><font color="#000000"><b>Manoj \
Kumara</b></font><div>Software Engineer<br>WSO2 Inc. <a href="http://wso2.com/" \
target="_blank">http://wso2.com/</a> <br>

<b style><font color="#666666">lean.enterprise.middleware</font></b><div><div>Mobile: \
<a href="tel:%2B94713448188" value="+94713448188" \
target="_blank">+94713448188</a><br></div></div></div></div></div> \
<br><br></div><div><div class="h5"><div class="gmail_quote">On Wed, Feb 19, 2014 at \
5:50 PM, Kishanthan Thangarajah <span dir="ltr">&lt;<a \
href="mailto:kishanthan@wso2.com" target="_blank">kishanthan@wso2.com</a>&gt;</span> \
wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">

<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote"><div>On \
Wed, Feb 19, 2014 at 5:36 PM, Sameera Jayasoma <span dir="ltr">&lt;<a \
href="mailto:sameera@wso2.com" target="_blank">sameera@wso2.com</a>&gt;</span> \
wrote:<br>

<blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div \
dir="ltr">Hi Manoj,<div><br></div><div>Yes we need a patching strategy for Git based \
Carbon 4 codebase. The solution will come into act once the 4.3 release is done. I \
think we can use the existing kernel patching strategy. But we need to figure our a \
proper Git branching mechanism. e.g. maintaining  a branch for a kernel patch and \
once the release is done, merge the patch branch with the master.</div>

</div></blockquote><div><br></div></div>We can follow the same process we planned \
other repos/products. The fixes can be send as pull requests to the kernel dev repo \
(not to the main repo). So if some wants to patch kernel, they can do so via this \
process. Kernel team will check this pull request and merge it with the dev repo. \
</div>

<div class="gmail_quote"><br></div><div class="gmail_quote">Once we plan on releasing \
a kernel patch, then we can send these fixes as pull requests to main repo [1]. When \
it is successfully merged, we can create a branch for that patch and do the \
release.</div>

<div>

<div class="gmail_quote"><div></div><div><br></div><blockquote class="gmail_quote" \
style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div \
dir="ltr">

<div><br></div><div>Sameera.</div></div><div \
class="gmail_extra"><div><div><br><br><div class="gmail_quote">On Tue, Feb 18, 2014 \
at 10:41 AM, Manoj Kumara <span dir="ltr">&lt;<a href="mailto:manoj@wso2.com" \
target="_blank">manoj@wso2.com</a>&gt;</span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div \
dir="ltr"><div>Hi,</div><div><br></div><div>Since we are now maintaining Carbon 4.x \
kernel on Git what will be the best way to do the $Subject for . Should we merge the \
changes at the time of the patch get released as a step of the release process. \
Otherwise there can be more pull requests if we merge with Git for every kernel \
fix.</div>

<div><br></div><div>WDYT ?</div><div><br></div><div><br></div><div>[1] <a \
href="https://github.com/wso2/carbon4-kernel" \
target="_blank">https://github.com/wso2/carbon4-kernel</a></div><span><font \
color="#888888"><div>

<br></div><div><div dir="ltr"><div>

<br></div><font color="#000000"><b>Manoj Kumara</b></font><div>
Software Engineer<br>WSO2 Inc. <a href="http://wso2.com/" \
target="_blank">http://wso2.com/</a> <br><b><font \
color="#666666">lean.enterprise.middleware</font></b><div><div>Mobile: <a \
href="tel:%2B94713448188" value="+94713448188" target="_blank">+94713448188</a><br>

</div></div></div></div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span><font \
color="#888888">-- <br><div dir="ltr"><font color="#336666">Sameera \
Jayasoma,<br>Architect,</font><div><span style="color:rgb(51,102,102)"><br>

</span></div><div><span style="color:rgb(51,102,102)">WSO2, Inc. (</span><a \
href="http://wso2.com" target="_blank">http://wso2.com</a><span \
style="color:rgb(51,102,102)">)</span><font color="#336666"><br>

email: <a href="mailto:sameera@wso2.com" \
target="_blank">sameera@wso2.com</a><br>blog: </font><a \
href="http://sameera.adahas.org" \
target="_blank">http://sameera.adahas.org</a><div>twitter: <a \
href="https://twitter.com/sameerajayasoma" \
target="_blank">https://twitter.com/sameerajayasoma</a></div>

<div>flickr: <a href="http://www.flickr.com/photos/sameera-jayasoma/collections" \
target="_blank">http://www.flickr.com/photos/sameera-jayasoma/collections</a></div><div><span \
style="color:rgb(136,136,136)">Mobile: 0094776364456</span><br>

<br><font color="#336666">Lean . Enterprise . Middleware</font></div></div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div></div><span><font \
color="#888888">-- <br><div dir="ltr"><b>Kishanthan Thangarajah</b><div>Senior \
Software Engineer, </div><div>Platform Technologies Team,</div>

<div>WSO2, Inc.</div><div><span>lean.enterprise.middleware</span></div>

<div><span><br></span></div><div><span>Mobile - <a href="tel:%2B94773426635" \
value="+94773426635" target="_blank">+94773426635</a></span></div><div>Blog - <i><a \
href="http://kishanthan.wordpress.com" \
target="_blank">http://kishanthan.wordpress.com</a></i></div>

<div>Twitter - <i><a href="http://twitter.com/kishanthan" \
target="_blank">http://twitter.com/kishanthan</a></i></div> </div>
</font></span></div></div>
</blockquote></div><br></div></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div \
dir="ltr"><b>Kishanthan Thangarajah</b><div>Senior Software Engineer, \
</div><div>Platform Technologies Team,</div><div>WSO2, \
Inc.</div><div><span>lean.enterprise.middleware</span></div>

<div><span><br></span></div><div><span>Mobile - +94773426635</span></div><div>Blog - \
<i><a href="http://kishanthan.wordpress.com" \
target="_blank">http://kishanthan.wordpress.com</a></i></div><div>Twitter - <i><a \
href="http://twitter.com/kishanthan" \
target="_blank">http://twitter.com/kishanthan</a></i></div>

</div>
</div>

_______________________________________________
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev

[prev in list] [next in list] [prev in thread] [next in thread] 