Acceptable Patch Format

[Atri Sharma]

Folks,

Is git diff > patch.patch good enough to be put on JIRA? I tried running
format script but got following errors (I am on sprint 5 branch):


Already on 'ignite-sprint-5'
Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit.
Switched to a new branch 'tmppatch'
 (nothing to squash)Already up-to-date.
# On branch tmppatch


and it generates an empty patch file.


--
Regards,

Atri
*l'apprenant*

[Konstantin Boudnik-2]

In Bigtop we follow this process
    https://cwiki.apache.org/confluence/display/BIGTOP/How+to+Contribute

which is quite handy as it turned out.

Cos

On Tue, Jun 02, 2015 at 08:38PM, Atri Sharma wrote:

> Folks,
>
> Is git diff > patch.patch good enough to be put on JIRA? I tried running
> format script but got following errors (I am on sprint 5 branch):
>
>
> Already on 'ignite-sprint-5'
> Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit.
> Switched to a new branch 'tmppatch'
>  (nothing to squash)Already up-to-date.
> # On branch tmppatch
>
>
> and it generates an empty patch file.
>
>
> --
> Regards,
>
> Atri
> *l'apprenant*

[Artem Shutak]

Hi Atri,

Now, we have useful information about patching here:
https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process.
But I agree with Cos, we need to have a page like "How to contribute". I
will do it.

Atri, thanks, for your feed back. You should be on branch with your
changes. I will add more understandable information at the script.


-- Artem --

On Tue, Jun 2, 2015 at 6:28 PM, Konstantin Boudnik <[hidden email]> wrote:

> In Bigtop we follow this process
>     https://cwiki.apache.org/confluence/display/BIGTOP/How+to+Contribute
>
> which is quite handy as it turned out.
>
> Cos
>
> On Tue, Jun 02, 2015 at 08:38PM, Atri Sharma wrote:
> > Folks,
> >
> > Is git diff > patch.patch good enough to be put on JIRA? I tried running
> > format script but got following errors (I am on sprint 5 branch):
> >
> >
> > Already on 'ignite-sprint-5'
> > Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit.
> > Switched to a new branch 'tmppatch'
> >  (nothing to squash)Already up-to-date.
> > # On branch tmppatch
> >
> >
> > and it generates an empty patch file.
> >
> >
> > --
> > Regards,
> >
> > Atri
> > *l'apprenant*
>

[Gianfranco Murador]

Hi Artem,
 I'm going to run the following commands to create the patch.  are these
steps correct ?

## Get the repo
git clone -b ignite-sprint-5 https://github.com/apache/incubator-ignite.git
git checkout -b ignite-788

## Commit the changes
git commit -a -m 'Ignite 788 Implementation';
git checkout -b ignite-sprint-5
git merge ignite-788

## launch the script to create a file patch
scripts/git-format-patch.sh

Thank you,
 Regards, Gianfranco



2015-06-02 17:44 GMT+02:00 Artiom Shutak <[hidden email]>:

> Hi Atri,
>
> Now, we have useful information about patching here:
> https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process.
> But I agree with Cos, we need to have a page like "How to contribute". I
> will do it.
>
> Atri, thanks, for your feed back. You should be on branch with your
> changes. I will add more understandable information at the script.
>
>
> -- Artem --
>
> On Tue, Jun 2, 2015 at 6:28 PM, Konstantin Boudnik <[hidden email]> wrote:
>
> > In Bigtop we follow this process
> >     https://cwiki.apache.org/confluence/display/BIGTOP/How+to+Contribute
> >
> > which is quite handy as it turned out.
> >
> > Cos
> >
> > On Tue, Jun 02, 2015 at 08:38PM, Atri Sharma wrote:
> > > Folks,
> > >
> > > Is git diff > patch.patch good enough to be put on JIRA? I tried
> running
> > > format script but got following errors (I am on sprint 5 branch):
> > >
> > >
> > > Already on 'ignite-sprint-5'
> > > Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit.
> > > Switched to a new branch 'tmppatch'
> > >  (nothing to squash)Already up-to-date.
> > > # On branch tmppatch
> > >
> > >
> > > and it generates an empty patch file.
> > >
> > >
> > > --
> > > Regards,
> > >
> > > Atri
> > > *l'apprenant*
> >
>

[Branko Čibej]

On 03.06.2015 10:06, Gianfranco Murador wrote:

> Hi Artem,
>  I'm going to run the following commands to create the patch.  are these
> steps correct ?
>
> ## Get the repo
> git clone -b ignite-sprint-5 https://github.com/apache/incubator-ignite.git
> git checkout -b ignite-788
>
> ## Commit the changes
> git commit -a -m 'Ignite 788 Implementation';
> git checkout -b ignite-sprint-5
> git merge ignite-788
>
> ## launch the script to create a file patch
> scripts/git-format-patch.sh
>
> Thank you,
>  Regards, Gianfranco

Blimey. If this is even close to true, I'm even more astounded by
gitficionados. So much churn just to replicate something that 'svn diff'
can do in oine go. :)

-- Brane

[Artem Shutak]

Hi Gianfranco,

You need to merge ignite-sptint-5 branch to your ignite-788 (not vice
versa).

Right steps:

## Get the repo
git clone -b ignite-sprint-5 https://github.com/apache/incubator-ignite.git
git checkout -b ignite-788

## Some development here with many commits at ignite-788.
git commit -a -m 'ignite-788: Intermediate commit 1';
...
git commit -a -m 'ignite-788: Intermediate commit 100';

## Commit the last changes.
git commit -a -m 'ignite-788: Implemented.';

## Making patch.
## There are a lot of changes at ignite-sprint-5 and we need to get it,
resolve conflicts (if exists), rerun tests for ignite-788.
git merge ignite-sprint-5
## Run script to make patch. Patch will have all changes as one commit.
./scripts/git-format-patch.sh

Note: it is strongly recommended to merge current sprint branch (git merge
ignite-sprint-5) to your development branch, for example, every day (or
after each commit).

Let me know, if step-by-step description helps you, then I will add it to
our wiki.

-- Artem --

On Wed, Jun 3, 2015 at 11:06 AM, Gianfranco Murador <
[hidden email]> wrote:

> Hi Artem,
>  I'm going to run the following commands to create the patch.  are these
> steps correct ?
>
> ## Get the repo
> git clone -b ignite-sprint-5
> https://github.com/apache/incubator-ignite.git
> git checkout -b ignite-788
>
> ## Commit the changes
> git commit -a -m 'Ignite 788 Implementation';
> git checkout -b ignite-sprint-5
> git merge ignite-788
>
> ## launch the script to create a file patch
> scripts/git-format-patch.sh
>
> Thank you,
>  Regards, Gianfranco
>
>
>
> 2015-06-02 17:44 GMT+02:00 Artiom Shutak <[hidden email]>:
>
> > Hi Atri,
> >
> > Now, we have useful information about patching here:
> > https://cwiki.apache.org/confluence/display/IGNITE/Sprint+Process.
> > But I agree with Cos, we need to have a page like "How to contribute". I
> > will do it.
> >
> > Atri, thanks, for your feed back. You should be on branch with your
> > changes. I will add more understandable information at the script.
> >
> >
> > -- Artem --
> >
> > On Tue, Jun 2, 2015 at 6:28 PM, Konstantin Boudnik <[hidden email]>
> wrote:
> >
> > > In Bigtop we follow this process
> > >
> https://cwiki.apache.org/confluence/display/BIGTOP/How+to+Contribute
> > >
> > > which is quite handy as it turned out.
> > >
> > > Cos
> > >
> > > On Tue, Jun 02, 2015 at 08:38PM, Atri Sharma wrote:
> > > > Folks,
> > > >
> > > > Is git diff > patch.patch good enough to be put on JIRA? I tried
> > running
> > > > format script but got following errors (I am on sprint 5 branch):
> > > >
> > > >
> > > > Already on 'ignite-sprint-5'
> > > > Your branch is ahead of 'origin/ignite-sprint-5' by 1 commit.
> > > > Switched to a new branch 'tmppatch'
> > > >  (nothing to squash)Already up-to-date.
> > > > # On branch tmppatch
> > > >
> > > >
> > > > and it generates an empty patch file.
> > > >
> > > >
> > > > --
> > > > Regards,
> > > >
> > > > Atri
> > > > *l'apprenant*
> > >
> >
>

[Konstantin Boudnik-2]

On Wed, Jun 03, 2015 at 11:46AM, Branko Čibej wrote:

> On 03.06.2015 10:06, Gianfranco Murador wrote:
> > Hi Artem,
> >  I'm going to run the following commands to create the patch.  are these
> > steps correct ?
> >
> > ## Get the repo
> > git clone -b ignite-sprint-5 https://github.com/apache/incubator-ignite.git
> > git checkout -b ignite-788
> >
> > ## Commit the changes
> > git commit -a -m 'Ignite 788 Implementation';
> > git checkout -b ignite-sprint-5
> > git merge ignite-788
> >
> > ## launch the script to create a file patch
> > scripts/git-format-patch.sh
> >
> > Thank you,
> >  Regards, Gianfranco
>
>
>
> Blimey. If this is even close to true, I'm even more astounded by
> gitficionados. So much churn just to replicate something that 'svn diff'
> can do in oine go. :)

Clearly, 'git diff' would be doing the same as 'svn diff' The whole
paraphernalia, hopefully, has to do with how to make the changes available to
the CI system. But...! And this is a big butt ;) non-committers don't have
creds to push new branches to git anyway. Hence, they should be able to deal
with their local git branches as they pleased, IMO. The only thing we need to
have requirements for - is the patch format: either 'git format-patch' or
else.

Cos

[Artem Shutak]

Actually, we do not have any requirements about development process for
non-committers (branches and etc.).

There is only one requirement: a patch file has to be applicable to the
HEAD of current ignite-sprint-xxx branch by "git am <patch-file>" (TC
actually do it) and has to have all changes in one commit.

We just suggest useful schema to do it.

-- Artem --

On Wed, Jun 3, 2015 at 12:57 PM, Konstantin Boudnik <[hidden email]> wrote:

> On Wed, Jun 03, 2015 at 11:46AM, Branko Čibej wrote:
> > On 03.06.2015 10:06, Gianfranco Murador wrote:
> > > Hi Artem,
> > >  I'm going to run the following commands to create the patch.  are
> these
> > > steps correct ?
> > >
> > > ## Get the repo
> > > git clone -b ignite-sprint-5
> https://github.com/apache/incubator-ignite.git
> > > git checkout -b ignite-788
> > >
> > > ## Commit the changes
> > > git commit -a -m 'Ignite 788 Implementation';
> > > git checkout -b ignite-sprint-5
> > > git merge ignite-788
> > >
> > > ## launch the script to create a file patch
> > > scripts/git-format-patch.sh
> > >
> > > Thank you,
> > >  Regards, Gianfranco
> >
> >
> >
> > Blimey. If this is even close to true, I'm even more astounded by
> > gitficionados. So much churn just to replicate something that 'svn diff'
> > can do in oine go. :)
>
> Clearly, 'git diff' would be doing the same as 'svn diff' The whole
> paraphernalia, hopefully, has to do with how to make the changes available
> to
> the CI system. But...! And this is a big butt ;) non-committers don't have
> creds to push new branches to git anyway. Hence, they should be able to
> deal
> with their local git branches as they pleased, IMO. The only thing we need
> to
> have requirements for - is the patch format: either 'git format-patch' or
> else.
>
> Cos
>

[Artem Shutak]

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

-- Artem --

On Wed, Jun 3, 2015 at 1:35 PM, Artiom Shutak <[hidden email]> wrote:

> Actually, we do not have any requirements about development process for
> non-committers (branches and etc.).
>
> There is only one requirement: a patch file has to be applicable to the
> HEAD of current ignite-sprint-xxx branch by "git am <patch-file>" (TC
> actually do it) and has to have all changes in one commit.
>
> We just suggest useful schema to do it.
>
> -- Artem --
>
> On Wed, Jun 3, 2015 at 12:57 PM, Konstantin Boudnik <[hidden email]>
> wrote:
>
>> On Wed, Jun 03, 2015 at 11:46AM, Branko Čibej wrote:
>> > On 03.06.2015 10:06, Gianfranco Murador wrote:
>> > > Hi Artem,
>> > >  I'm going to run the following commands to create the patch.  are
>> these
>> > > steps correct ?
>> > >
>> > > ## Get the repo
>> > > git clone -b ignite-sprint-5
>> https://github.com/apache/incubator-ignite.git
>> > > git checkout -b ignite-788
>> > >
>> > > ## Commit the changes
>> > > git commit -a -m 'Ignite 788 Implementation';
>> > > git checkout -b ignite-sprint-5
>> > > git merge ignite-788
>> > >
>> > > ## launch the script to create a file patch
>> > > scripts/git-format-patch.sh
>> > >
>> > > Thank you,
>> > >  Regards, Gianfranco
>> >
>> >
>> >
>> > Blimey. If this is even close to true, I'm even more astounded by
>> > gitficionados. So much churn just to replicate something that 'svn diff'
>> > can do in oine go. :)
>>
>> Clearly, 'git diff' would be doing the same as 'svn diff' The whole
>> paraphernalia, hopefully, has to do with how to make the changes
>> available to
>> the CI system. But...! And this is a big butt ;) non-committers don't have
>> creds to push new branches to git anyway. Hence, they should be able to
>> deal
>> with their local git branches as they pleased, IMO. The only thing we
>> need to
>> have requirements for - is the patch format: either 'git format-patch' or
>> else.
>>
>> Cos
>>
>
>

[Gianfranco Murador]

Thank you so much, Artem.
On Jun 3, 2015 3:04 PM, "Artiom Shutak" <[hidden email]> wrote:

> I've init How to Contribute
> <https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute>
> page.
> Please, take a look.
>
> -- Artem --
>
> On Wed, Jun 3, 2015 at 1:35 PM, Artiom Shutak <[hidden email]>
> wrote:
>
> > Actually, we do not have any requirements about development process for
> > non-committers (branches and etc.).
> >
> > There is only one requirement: a patch file has to be applicable to the
> > HEAD of current ignite-sprint-xxx branch by "git am <patch-file>" (TC
> > actually do it) and has to have all changes in one commit.
> >
> > We just suggest useful schema to do it.
> >
> > -- Artem --
> >
> > On Wed, Jun 3, 2015 at 12:57 PM, Konstantin Boudnik <[hidden email]>
> > wrote:
> >
> >> On Wed, Jun 03, 2015 at 11:46AM, Branko Čibej wrote:
> >> > On 03.06.2015 10:06, Gianfranco Murador wrote:
> >> > > Hi Artem,
> >> > >  I'm going to run the following commands to create the patch.  are
> >> these
> >> > > steps correct ?
> >> > >
> >> > > ## Get the repo
> >> > > git clone -b ignite-sprint-5
> >> https://github.com/apache/incubator-ignite.git
> >> > > git checkout -b ignite-788
> >> > >
> >> > > ## Commit the changes
> >> > > git commit -a -m 'Ignite 788 Implementation';
> >> > > git checkout -b ignite-sprint-5
> >> > > git merge ignite-788
> >> > >
> >> > > ## launch the script to create a file patch
> >> > > scripts/git-format-patch.sh
> >> > >
> >> > > Thank you,
> >> > >  Regards, Gianfranco
> >> >
> >> >
> >> >
> >> > Blimey. If this is even close to true, I'm even more astounded by
> >> > gitficionados. So much churn just to replicate something that 'svn
> diff'
> >> > can do in oine go. :)
> >>
> >> Clearly, 'git diff' would be doing the same as 'svn diff' The whole
> >> paraphernalia, hopefully, has to do with how to make the changes
> >> available to
> >> the CI system. But...! And this is a big butt ;) non-committers don't
> have
> >> creds to push new branches to git anyway. Hence, they should be able to
> >> deal
> >> with their local git branches as they pleased, IMO. The only thing we
> >> need to
> >> have requirements for - is the patch format: either 'git format-patch'
> or
> >> else.
> >>
> >> Cos
> >>
> >
> >
>