Create patch instructions.

[Sergi]

Guys,

Why don't we have instructions on how to create a patch here?
http://ignite.incubator.apache.org/community/contribute.html#contribute

Can someone fix?

Sergi

[Sergi]

Also the page contains outdated instructions about sprints:



*The "master" branch contains the last released version. The "sprint-N"
branch contains the latest code for the Nth sprint....*
Sergi



2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:

> Guys,
>
> Why don't we have instructions on how to create a patch here?
> http://ignite.incubator.apache.org/community/contribute.html#contribute
>
> Can someone fix?
>
> Sergi
>

[Sergi]

Also a wiki page should contain instructions how to provide patch for
release branch instead of master.

By the way since we have these patching scripts only for bash, we probably
should provide additional instruction for Windows users.

Sergi

P.S. Just trying to contribute something to Ignite and it is not that easy
=)

2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:

> Also the page contains outdated instructions about sprints:
>
>
>
> *The "master" branch contains the last released version. The "sprint-N"
> branch contains the latest code for the Nth sprint....*
> Sergi
>
>
>
> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:
>
>> Guys,
>>
>> Why don't we have instructions on how to create a patch here?
>> http://ignite.incubator.apache.org/community/contribute.html#contribute
>>
>> Can someone fix?
>>
>> Sergi
>>
>
>

[Sergi]

I meant this wiki page:
https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute

Sergi

2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]>:

> Also a wiki page should contain instructions how to provide patch for
> release branch instead of master.
>
> By the way since we have these patching scripts only for bash, we probably
> should provide additional instruction for Windows users.
>
> Sergi
>
> P.S. Just trying to contribute something to Ignite and it is not that easy
> =)
>
> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:
>
>> Also the page contains outdated instructions about sprints:
>>
>>
>>
>> *The "master" branch contains the last released version. The "sprint-N"
>> branch contains the latest code for the Nth sprint....*
>> Sergi
>>
>>
>>
>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:
>>
>>> Guys,
>>>
>>> Why don't we have instructions on how to create a patch here?
>>> http://ignite.incubator.apache.org/community/contribute.html#contribute
>>>
>>> Can someone fix?
>>>
>>> Sergi
>>>
>>
>>
>

[Branko Čibej]

Sergi, why don't you just fix the Wiki?

-- Brane

On 30.07.2015 11:18, Sergi Vladykin wrote:

> I meant this wiki page:
> https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
>
> Sergi
>
> 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]>:
>
>> Also a wiki page should contain instructions how to provide patch for
>> release branch instead of master.
>>
>> By the way since we have these patching scripts only for bash, we probably
>> should provide additional instruction for Windows users.
>>
>> Sergi
>>
>> P.S. Just trying to contribute something to Ignite and it is not that easy
>> =)
>>
>> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:
>>
>>> Also the page contains outdated instructions about sprints:
>>>
>>>
>>>
>>> *The "master" branch contains the last released version. The "sprint-N"
>>> branch contains the latest code for the Nth sprint....*
>>> Sergi
>>>
>>>
>>>
>>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:
>>>
>>>> Guys,
>>>>
>>>> Why don't we have instructions on how to create a patch here?
>>>> http://ignite.incubator.apache.org/community/contribute.html#contribute
>>>>
>>>> Can someone fix?
>>>>
>>>> Sergi
>>>>
>>>

[Sergi]

Brane,

It appeared that I can't login into the wiki and for some reason it does
not send me email to reset my password.. Probably I have to file INFRA
issue?

Sergi

2015-07-30 14:43 GMT+03:00 Branko Čibej <[hidden email]>:

> Sergi, why don't you just fix the Wiki?
>
> -- Brane
>
> On 30.07.2015 11:18, Sergi Vladykin wrote:
> > I meant this wiki page:
> > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
> >
> > Sergi
> >
> > 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]>:
> >
> >> Also a wiki page should contain instructions how to provide patch for
> >> release branch instead of master.
> >>
> >> By the way since we have these patching scripts only for bash, we
> probably
> >> should provide additional instruction for Windows users.
> >>
> >> Sergi
> >>
> >> P.S. Just trying to contribute something to Ignite and it is not that
> easy
> >> =)
> >>
> >> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:
> >>
> >>> Also the page contains outdated instructions about sprints:
> >>>
> >>>
> >>>
> >>> *The "master" branch contains the last released version. The "sprint-N"
> >>> branch contains the latest code for the Nth sprint....*
> >>> Sergi
> >>>
> >>>
> >>>
> >>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:
> >>>
> >>>> Guys,
> >>>>
> >>>> Why don't we have instructions on how to create a patch here?
> >>>>
> http://ignite.incubator.apache.org/community/contribute.html#contribute
> >>>>
> >>>> Can someone fix?
> >>>>
> >>>> Sergi
> >>>>
> >>>
>
>

[Konstantin Boudnik-2]

Someone with admin rights on the space might be able to help you
(unfortunately, I don't have such permissions). If not - try filing the INFRA
ticket as you proposed.

Cos

On Thu, Jul 30, 2015 at 09:52PM, Sergi Vladykin wrote:

> Brane,
>
> It appeared that I can't login into the wiki and for some reason it does
> not send me email to reset my password.. Probably I have to file INFRA
> issue?
>
> Sergi
>
> 2015-07-30 14:43 GMT+03:00 Branko Čibej <[hidden email]>:
>
> > Sergi, why don't you just fix the Wiki?
> >
> > -- Brane
> >
> > On 30.07.2015 11:18, Sergi Vladykin wrote:
> > > I meant this wiki page:
> > > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
> > >
> > > Sergi
> > >
> > > 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]>:
> > >
> > >> Also a wiki page should contain instructions how to provide patch for
> > >> release branch instead of master.
> > >>
> > >> By the way since we have these patching scripts only for bash, we
> > probably
> > >> should provide additional instruction for Windows users.
> > >>
> > >> Sergi
> > >>
> > >> P.S. Just trying to contribute something to Ignite and it is not that
> > easy
> > >> =)
> > >>
> > >> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:
> > >>
> > >>> Also the page contains outdated instructions about sprints:
> > >>>
> > >>>
> > >>>
> > >>> *The "master" branch contains the last released version. The "sprint-N"
> > >>> branch contains the latest code for the Nth sprint....*
> > >>> Sergi
> > >>>
> > >>>
> > >>>
> > >>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]>:
> > >>>
> > >>>> Guys,
> > >>>>
> > >>>> Why don't we have instructions on how to create a patch here?
> > >>>>
> > http://ignite.incubator.apache.org/community/contribute.html#contribute
> > >>>>
> > >>>> Can someone fix?
> > >>>>
> > >>>> Sergi
> > >>>>
> > >>>
> >
> >

[dsetrakyan]

On Thu, Jul 30, 2015 at 11:52 AM, Sergi Vladykin <[hidden email]>
wrote:

> Brane,
>
> It appeared that I can't login into the wiki and for some reason it does
> not send me email to reset my password.. Probably I have to file INFRA
> issue?
>

Sergi, I just checked and you should have the sufficient permissions. Can
you try again?

>
> Sergi
>
> 2015-07-30 14:43 GMT+03:00 Branko Čibej <[hidden email]>:
>
> > Sergi, why don't you just fix the Wiki?
> >
> > -- Brane
> >
> > On 30.07.2015 11:18, Sergi Vladykin wrote:
> > > I meant this wiki page:
> > > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
> > >
> > > Sergi
> > >
> > > 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]>:
> > >
> > >> Also a wiki page should contain instructions how to provide patch for
> > >> release branch instead of master.
> > >>
> > >> By the way since we have these patching scripts only for bash, we
> > probably
> > >> should provide additional instruction for Windows users.
> > >>
> > >> Sergi
> > >>
> > >> P.S. Just trying to contribute something to Ignite and it is not that
> > easy
> > >> =)
> > >>
> > >> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]>:
> > >>
> > >>> Also the page contains outdated instructions about sprints:
> > >>>
> > >>>
> > >>>
> > >>> *The "master" branch contains the last released version. The
> "sprint-N"
> > >>> branch contains the latest code for the Nth sprint....*
> > >>> Sergi
> > >>>
> > >>>
> > >>>
> > >>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <[hidden email]
> >:
> > >>>
> > >>>> Guys,
> > >>>>
> > >>>> Why don't we have instructions on how to create a patch here?
> > >>>>
> > http://ignite.incubator.apache.org/community/contribute.html#contribute
> > >>>>
> > >>>> Can someone fix?
> > >>>>
> > >>>> Sergi
> > >>>>
> > >>>
> >
> >
>

[Artem Shutak]

Guys,

I've updated
https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute.
Please, take a look.
Also, I think we can just remove
https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process. Thoughts?

>Why don't we have instructions on how to create a patch here?
> http://ignite.incubator.apache.org/community/contribute.html#contribute

I think we should have a gold source for this information. In my opinion it
should be wiki.
http://ignite.incubator.apache.org/community/contribute.html#contribute should
just have a link on wiki.


-- Artem --

On Tue, Aug 4, 2015 at 1:42 AM, Dmitriy Setrakyan <[hidden email]>
wrote:

> On Thu, Jul 30, 2015 at 11:52 AM, Sergi Vladykin <[hidden email]
> >
> wrote:
>
> > Brane,
> >
> > It appeared that I can't login into the wiki and for some reason it does
> > not send me email to reset my password.. Probably I have to file INFRA
> > issue?
> >
>
> Sergi, I just checked and you should have the sufficient permissions. Can
> you try again?
>
>
> >
> > Sergi
> >
> > 2015-07-30 14:43 GMT+03:00 Branko Čibej <[hidden email]>:
> >
> > > Sergi, why don't you just fix the Wiki?
> > >
> > > -- Brane
> > >
> > > On 30.07.2015 11:18, Sergi Vladykin wrote:
> > > > I meant this wiki page:
> > > > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
> > > >
> > > > Sergi
> > > >
> > > > 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <[hidden email]
> >:
> > > >
> > > >> Also a wiki page should contain instructions how to provide patch
> for
> > > >> release branch instead of master.
> > > >>
> > > >> By the way since we have these patching scripts only for bash, we
> > > probably
> > > >> should provide additional instruction for Windows users.
> > > >>
> > > >> Sergi
> > > >>
> > > >> P.S. Just trying to contribute something to Ignite and it is not
> that
> > > easy
> > > >> =)
> > > >>
> > > >> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <[hidden email]
> >:
> > > >>
> > > >>> Also the page contains outdated instructions about sprints:
> > > >>>
> > > >>>
> > > >>>
> > > >>> *The "master" branch contains the last released version. The
> > "sprint-N"
> > > >>> branch contains the latest code for the Nth sprint....*
> > > >>> Sergi
> > > >>>
> > > >>>
> > > >>>
> > > >>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <
> [hidden email]
> > >:
> > > >>>
> > > >>>> Guys,
> > > >>>>
> > > >>>> Why don't we have instructions on how to create a patch here?
> > > >>>>
> > >
> http://ignite.incubator.apache.org/community/contribute.html#contribute
> > > >>>>
> > > >>>> Can someone fix?
> > > >>>>
> > > >>>> Sergi
> > > >>>>
> > > >>>
> > >
> > >
> >
>

[dsetrakyan]

On Tue, Aug 4, 2015 at 12:13 PM, Artem Shutak <[hidden email]> wrote:

> Guys,
>
> I've updated
> https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute.
> Please, take a look.
>

Thanks!


> Also, I think we can just remove
> https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process.
> Thoughts?
>

+1

I think Sprint Process can be removed.

>
> >Why don't we have instructions on how to create a patch here?
> > http://ignite.incubator.apache.org/community/contribute.html#contribute
>
> I think we should have a gold source for this information. In my opinion it
> should be wiki.
> http://ignite.incubator.apache.org/community/contribute.html#contribute
> should
> just have a link on wiki.
>
>
> -- Artem --
>
> On Tue, Aug 4, 2015 at 1:42 AM, Dmitriy Setrakyan <[hidden email]>
> wrote:
>
> > On Thu, Jul 30, 2015 at 11:52 AM, Sergi Vladykin <
> [hidden email]
> > >
> > wrote:
> >
> > > Brane,
> > >
> > > It appeared that I can't login into the wiki and for some reason it
> does
> > > not send me email to reset my password.. Probably I have to file INFRA
> > > issue?
> > >
> >
> > Sergi, I just checked and you should have the sufficient permissions. Can
> > you try again?
> >
> >
> > >
> > > Sergi
> > >
> > > 2015-07-30 14:43 GMT+03:00 Branko Čibej <[hidden email]>:
> > >
> > > > Sergi, why don't you just fix the Wiki?
> > > >
> > > > -- Brane
> > > >
> > > > On 30.07.2015 11:18, Sergi Vladykin wrote:
> > > > > I meant this wiki page:
> > > > >
> https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute
> > > > >
> > > > > Sergi
> > > > >
> > > > > 2015-07-30 12:17 GMT+03:00 Sergi Vladykin <
> [hidden email]
> > >:
> > > > >
> > > > >> Also a wiki page should contain instructions how to provide patch
> > for
> > > > >> release branch instead of master.
> > > > >>
> > > > >> By the way since we have these patching scripts only for bash, we
> > > > probably
> > > > >> should provide additional instruction for Windows users.
> > > > >>
> > > > >> Sergi
> > > > >>
> > > > >> P.S. Just trying to contribute something to Ignite and it is not
> > that
> > > > easy
> > > > >> =)
> > > > >>
> > > > >> 2015-07-30 12:07 GMT+03:00 Sergi Vladykin <
> [hidden email]
> > >:
> > > > >>
> > > > >>> Also the page contains outdated instructions about sprints:
> > > > >>>
> > > > >>>
> > > > >>>
> > > > >>> *The "master" branch contains the last released version. The
> > > "sprint-N"
> > > > >>> branch contains the latest code for the Nth sprint....*
> > > > >>> Sergi
> > > > >>>
> > > > >>>
> > > > >>>
> > > > >>> 2015-07-30 12:05 GMT+03:00 Sergi Vladykin <
> > [hidden email]
> > > >:
> > > > >>>
> > > > >>>> Guys,
> > > > >>>>
> > > > >>>> Why don't we have instructions on how to create a patch here?
> > > > >>>>
> > > >
> > http://ignite.incubator.apache.org/community/contribute.html#contribute
> > > > >>>>
> > > > >>>> Can someone fix?
> > > > >>>>
> > > > >>>> Sergi
> > > > >>>>
> > > > >>>
> > > >
> > > >
> > >
> >
>

[Alexey Kuznetsov-2]

Artem, two comments:

1) Did you investigate possible workflow with "pull request" instead of
"patches"?
2) In your instruction I see "merge" from master, but as I remember there
was a discussion of using "rebase".

What do you think?

--
Alexey Kuznetsov
GridGain Systems
www.gridgain.com

[dsetrakyan]

Huge +1 on pull requests. Would be great if we could make TC work with that.

On Tue, Aug 4, 2015 at 5:30 PM, Alexey Kuznetsov <[hidden email]>
wrote:

> Artem, two comments:
>
> 1) Did you investigate possible workflow with "pull request" instead of
> "patches"?
> 2) In your instruction I see "merge" from master, but as I remember there
> was a discussion of using "rebase".
>
> What do you think?
>
> --
> Alexey Kuznetsov
> GridGain Systems
> www.gridgain.com
>

[Artem Shutak]

Inline.

On Wed, Aug 5, 2015 at 3:31 AM, Dmitriy Setrakyan <[hidden email]>
wrote:

> Huge +1 on pull requests. Would be great if we could make TC work with
> that.
>
> On Tue, Aug 4, 2015 at 5:30 PM, Alexey Kuznetsov <[hidden email]>
> wrote:
>
> > Artem, two comments:
> >
> > 1) Did you investigate possible workflow with "pull request" instead of
> > "patches"?
>

Yes, I'm investigating this approach.


> > 2) In your instruction I see "merge" from master, but as I remember there
> > was a discussion of using "rebase".
>

I don't like rebase. Actually, at example from wiki it's not important,
what will be used "rebase" or "merge", but with "merge" a contributor will
have more simple conflict resolving. The git-format-patch.sh script will
create patch file with only one commit, which contains all changes at
development branch (the branch local), so it will not save a history of
commits.


> >
> > What do you think?
> >
> > --
> > Alexey Kuznetsov
> > GridGain Systems
> > www.gridgain.com
> >
>

[yzhdanov]

inline

--Yakov

2015-08-04 22:13 GMT+03:00 Artem Shutak <[hidden email]>:

> Guys,
>
> I've updated
> https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute.
> Please, take a look.
>

1. I still come across few sprint-xx mentions
2. I would mention that contributors/committers can also fork GitHub mirror.



> Also, I think we can just remove
> https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process.
> Thoughts?
>

Disagree. I edited the page -
https://cwiki.apache.org/confluence/display/IGNITE/Git+Process


> >Why don't we have instructions on how to create a patch here?
> > http://ignite.incubator.apache.org/community/contribute.html#contribute
>
> I think we should have a gold source for this information. In my opinion it
> should be wiki.
> http://ignite.incubator.apache.org/community/contribute.html#contribute
> should
> just have a link on wiki.
>

+1


> -- Artem --
>
>

[Konstantin Boudnik-2]

On Wed, Aug 05, 2015 at 03:22PM, Artem Shutak wrote:

> Inline.
>
> On Wed, Aug 5, 2015 at 3:31 AM, Dmitriy Setrakyan <[hidden email]>
> wrote:
>
> > Huge +1 on pull requests. Would be great if we could make TC work with
> > that.
> >
> > On Tue, Aug 4, 2015 at 5:30 PM, Alexey Kuznetsov <[hidden email]>
> > wrote:
> >
> > > Artem, two comments:
> > >
> > > 1) Did you investigate possible workflow with "pull request" instead of
> > > "patches"?
> >
>
> Yes, I'm investigating this approach.
>
>
> > > 2) In your instruction I see "merge" from master, but as I remember there
> > > was a discussion of using "rebase".
> >
>
> I don't like rebase. Actually, at example from wiki it's not important,
> what will be used "rebase" or "merge", but with "merge" a contributor will
> have more simple conflict resolving. The git-format-patch.sh script will
> create patch file with only one commit, which contains all changes at
> development branch (the branch local), so it will not save a history of
> commits.

We have discussed exactly this point in length: why would you need to preserve
a potentially nonsensical commits like
    "Oh damn - I forgot to remove the comment in this file"

Also, I don't see how merge is easier from the conflict resolution POW. What
did you mean by that?

Cos


> > > What do you think?
> > >
> > > --
> > > Alexey Kuznetsov
> > > GridGain Systems
> > > www.gridgain.com
> > >
> >

[Artem Shutak]

On Fri, Aug 7, 2015 at 12:14 AM, Konstantin Boudnik <[hidden email]> wrote:

> On Wed, Aug 05, 2015 at 03:22PM, Artem Shutak wrote:
> > Inline.
> >
> > On Wed, Aug 5, 2015 at 3:31 AM, Dmitriy Setrakyan <[hidden email]
> >
> > wrote:
> >
> > > Huge +1 on pull requests. Would be great if we could make TC work with
> > > that.
> > >
> > > On Tue, Aug 4, 2015 at 5:30 PM, Alexey Kuznetsov <
> [hidden email]>
> > > wrote:
> > >
> > > > Artem, two comments:
> > > >
> > > > 1) Did you investigate possible workflow with "pull request" instead
> of
> > > > "patches"?
> > >
> >
> > Yes, I'm investigating this approach.
> >
> >
> > > > 2) In your instruction I see "merge" from master, but as I remember
> there
> > > > was a discussion of using "rebase".
> > >
> >
> > I don't like rebase. Actually, at example from wiki it's not important,
> > what will be used "rebase" or "merge", but with "merge" a contributor
> will
> > have more simple conflict resolving. The git-format-patch.sh script will
> > create patch file with only one commit, which contains all changes at
> > development branch (the branch local), so it will not save a history of
> > commits.
>
> We have discussed exactly this point in length: why would you need to
> preserve
> a potentially nonsensical commits like
>     "Oh damn - I forgot to remove the comment in this file"
>
> Also, I don't see how merge is easier from the conflict resolution POW.
> What
> did you mean by that?
>

I could be wrong, but in my understanding, with 'merge' you have 3 source
version of file: state of file at first branch, at second branch and a
'base' (a state of file for both branches before changes), with 'rebase'
you don't have the 'base' . In some cases this information can be really
helpful.

Artem

>
> Cos
>
>
> > > > What do you think?
> > > >
> > > > --
> > > > Alexey Kuznetsov
> > > > GridGain Systems
> > > > www.gridgain.com
> > > >
> > >
>