Re: Patch + jira vs pull request

2017-02-28 Thread Adel Boutros 
Thank you Ganesh for the explanation!


Regards,

Adel


From: Ganesh Murthy <gmur...@redhat.com>
Sent: Tuesday, February 28, 2017 3:31:57 PM
To: users@qpid.apache.org
Subject: Re: Patch + jira vs pull request

A few days back, I had emailed Travis support and asked them why the builds 
were taking too long to start. This is what they said -

"I've been taking a look at the logs and it appears that at the time when your 
build #199359621 was triggered, the Apache organization was running at 
capacity, and this delayed the start time of the jobs.

At the moment, I see that the organization is running at capacity too and it 
has some backlog of pending jobs waiting to start. To help with this high 
activity peak, I've boosted Apache's capacity from 30 to 50 concurrent jobs for 
the next 4 hours."

So, when you submitted the pull request, it simply looks like Travis was 
running at full capacity for Apache. It should come thru as soon as the backlog 
is cleared.


Thanks.

- Original Message -
> From: "Adel Boutros" <adelbout...@live.com>
> To: users@qpid.apache.org
> Sent: Tuesday, February 28, 2017 9:10:26 AM
> Subject: Re: Patch + jira vs pull request
>
> Hello,
>
>
> I was testing this morning the pull request mechanism. I was able to perform
> the pull request however it seems Travis has not built it yet.
>
> Is there a way to know what's blocking it?
> (https://travis-ci.org/apache/qpid-dispatch/builds/206144819)
>
>
> Regards,
>
> Adel
>
> 
> From: Robbie Gemmell <robbie.gemm...@gmail.com>
> Sent: Monday, February 6, 2017 4:08:13 PM
> To: users@qpid.apache.org
> Subject: Re: Patch + jira vs pull request
>
> As an aside, for anyone else wanting to do this type of thing, I used
> this to add a remote called 'github' to my existing checkout and make
> the PRs available at ref github/pr/:
>
> git remote add github https://github.com/apache/qpid-java.git
> git config --local --add remote.github.fetch
> '+refs/pull/*/head:refs/remotes/github/pr/*'
> git fetch --all
>
> To use a different name for the remote, find/replace instances of
> github other than in the mirror URL with your chosen remote name. To
> use another repo, change the name in the URL.
>
> Robbie
>
> On 31 January 2017 at 12:26, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
> > This is now enabled, see
> > https://issues.apache.org/jira/browse/QPID-7650 and
> > https://github.com/apache/qpid-java/pull/5 as example.
> >
> > Note that the mails to the dev@ list were still not seen, as something
> > seems to be wrong with the list, or at least JIRA. No mails from JIRA
> > are arriving, even though I have been receiving the matching/duplicate
> > mails sent directly to me. Raised as
> > https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
> > infra, likely related to the very recent JIRA upgrade. I'll give the
> > PR thing another check once its clearer what the issues are.
> >
> > Also, while the process of closing the PR worked fine, it did take a
> > good 20+mins for the commit to make it to the github mirror (via the
> > asf git mirror, via svn) and close it, as opposed to the near instant
> > updates normally seen when using the git repositories.
> >
> > Robbie
> >
> > On 30 January 2017 at 13:19, Robbie Gemmell <robbie.gemm...@gmail.com>
> > wrote:
> >> Saying that made me look, and it seems like the GitHub integration is
> >> indeed not enabled on the apache/qpid-java mirror. There are a few old
> >> open Pull Requests and one test PR open+closed (nice account Lorenz
> >> :P), none of which have been visible on the list. I raised
> >> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
> >> mails/JIRA comments integration enabled for the repo.
> >>
> >> Robbie
> >>
> >> On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com>
> >> wrote:
> >>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
> >>> the same for us in the end (almost identical if you really want, since
> >>> you can get a patch by adding .patch to github pr/diff/commit URLs).
> >>>
> >>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
> >>> that would be an oversight) on the particular GitHub mirror in
> >>> question, raising a PR generates a mail to the dev@ mailing list, and
> >>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
> >>> then a comment will also be placed on th

Re: Patch + jira vs pull request

2017-02-28 Thread Ganesh Murthy 
A few days back, I had emailed Travis support and asked them why the builds 
were taking too long to start. This is what they said - 

"I've been taking a look at the logs and it appears that at the time when your 
build #199359621 was triggered, the Apache organization was running at 
capacity, and this delayed the start time of the jobs.

At the moment, I see that the organization is running at capacity too and it 
has some backlog of pending jobs waiting to start. To help with this high 
activity peak, I've boosted Apache's capacity from 30 to 50 concurrent jobs for 
the next 4 hours."

So, when you submitted the pull request, it simply looks like Travis was 
running at full capacity for Apache. It should come thru as soon as the backlog 
is cleared.


Thanks. 

- Original Message -
> From: "Adel Boutros" <adelbout...@live.com>
> To: users@qpid.apache.org
> Sent: Tuesday, February 28, 2017 9:10:26 AM
> Subject: Re: Patch + jira vs pull request
> 
> Hello,
> 
> 
> I was testing this morning the pull request mechanism. I was able to perform
> the pull request however it seems Travis has not built it yet.
> 
> Is there a way to know what's blocking it?
> (https://travis-ci.org/apache/qpid-dispatch/builds/206144819)
> 
> 
> Regards,
> 
> Adel
> 
> 
> From: Robbie Gemmell <robbie.gemm...@gmail.com>
> Sent: Monday, February 6, 2017 4:08:13 PM
> To: users@qpid.apache.org
> Subject: Re: Patch + jira vs pull request
> 
> As an aside, for anyone else wanting to do this type of thing, I used
> this to add a remote called 'github' to my existing checkout and make
> the PRs available at ref github/pr/:
> 
> git remote add github https://github.com/apache/qpid-java.git
> git config --local --add remote.github.fetch
> '+refs/pull/*/head:refs/remotes/github/pr/*'
> git fetch --all
> 
> To use a different name for the remote, find/replace instances of
> github other than in the mirror URL with your chosen remote name. To
> use another repo, change the name in the URL.
> 
> Robbie
> 
> On 31 January 2017 at 12:26, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
> > This is now enabled, see
> > https://issues.apache.org/jira/browse/QPID-7650 and
> > https://github.com/apache/qpid-java/pull/5 as example.
> >
> > Note that the mails to the dev@ list were still not seen, as something
> > seems to be wrong with the list, or at least JIRA. No mails from JIRA
> > are arriving, even though I have been receiving the matching/duplicate
> > mails sent directly to me. Raised as
> > https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
> > infra, likely related to the very recent JIRA upgrade. I'll give the
> > PR thing another check once its clearer what the issues are.
> >
> > Also, while the process of closing the PR worked fine, it did take a
> > good 20+mins for the commit to make it to the github mirror (via the
> > asf git mirror, via svn) and close it, as opposed to the near instant
> > updates normally seen when using the git repositories.
> >
> > Robbie
> >
> > On 30 January 2017 at 13:19, Robbie Gemmell <robbie.gemm...@gmail.com>
> > wrote:
> >> Saying that made me look, and it seems like the GitHub integration is
> >> indeed not enabled on the apache/qpid-java mirror. There are a few old
> >> open Pull Requests and one test PR open+closed (nice account Lorenz
> >> :P), none of which have been visible on the list. I raised
> >> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
> >> mails/JIRA comments integration enabled for the repo.
> >>
> >> Robbie
> >>
> >> On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com>
> >> wrote:
> >>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
> >>> the same for us in the end (almost identical if you really want, since
> >>> you can get a patch by adding .patch to github pr/diff/commit URLs).
> >>>
> >>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
> >>> that would be an oversight) on the particular GitHub mirror in
> >>> question, raising a PR generates a mail to the dev@ mailing list, and
> >>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
> >>> then a comment will also be placed on the JIRA for the open/close and
> >>> any PR comments. The JIRA key should also be included in the commit so
> >>> that once merged the JIRA is updated with details of the actual commit
> >>> (see existin

Re: Patch + jira vs pull request

2017-02-28 Thread Adel Boutros 
Hello,


I was testing this morning the pull request mechanism. I was able to perform 
the pull request however it seems Travis has not built it yet.

Is there a way to know what's blocking it? 
(https://travis-ci.org/apache/qpid-dispatch/builds/206144819)


Regards,

Adel


From: Robbie Gemmell <robbie.gemm...@gmail.com>
Sent: Monday, February 6, 2017 4:08:13 PM
To: users@qpid.apache.org
Subject: Re: Patch + jira vs pull request

As an aside, for anyone else wanting to do this type of thing, I used
this to add a remote called 'github' to my existing checkout and make
the PRs available at ref github/pr/:

git remote add github https://github.com/apache/qpid-java.git
git config --local --add remote.github.fetch
'+refs/pull/*/head:refs/remotes/github/pr/*'
git fetch --all

To use a different name for the remote, find/replace instances of
github other than in the mirror URL with your chosen remote name. To
use another repo, change the name in the URL.

Robbie

On 31 January 2017 at 12:26, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
> This is now enabled, see
> https://issues.apache.org/jira/browse/QPID-7650 and
> https://github.com/apache/qpid-java/pull/5 as example.
>
> Note that the mails to the dev@ list were still not seen, as something
> seems to be wrong with the list, or at least JIRA. No mails from JIRA
> are arriving, even though I have been receiving the matching/duplicate
> mails sent directly to me. Raised as
> https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
> infra, likely related to the very recent JIRA upgrade. I'll give the
> PR thing another check once its clearer what the issues are.
>
> Also, while the process of closing the PR worked fine, it did take a
> good 20+mins for the commit to make it to the github mirror (via the
> asf git mirror, via svn) and close it, as opposed to the near instant
> updates normally seen when using the git repositories.
>
> Robbie
>
> On 30 January 2017 at 13:19, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
>> Saying that made me look, and it seems like the GitHub integration is
>> indeed not enabled on the apache/qpid-java mirror. There are a few old
>> open Pull Requests and one test PR open+closed (nice account Lorenz
>> :P), none of which have been visible on the list. I raised
>> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
>> mails/JIRA comments integration enabled for the repo.
>>
>> Robbie
>>
>> On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
>>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
>>> the same for us in the end (almost identical if you really want, since
>>> you can get a patch by adding .patch to github pr/diff/commit URLs).
>>>
>>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
>>> that would be an oversight) on the particular GitHub mirror in
>>> question, raising a PR generates a mail to the dev@ mailing list, and
>>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
>>> then a comment will also be placed on the JIRA for the open/close and
>>> any PR comments. The JIRA key should also be included in the commit so
>>> that once merged the JIRA is updated with details of the actual commit
>>> (see existing commits/JIRAs). We cant click the typical 'merge pr'
>>> button on GitHub at this time, as the mirrors are read only, but we
>>> can add the mirrors as remotes for our existing checkouts and
>>> merge+push PR commits to the source repo which then get mirrored
>>> similarly. PRs are marked merged automatically if their commit history
>>> became the unmodified head at the time of merge, but more safely can
>>> be closed out by a commit (either the specific one with the changes,
>>> or a merge commit introducing the original, or just an empty commit)
>>> containing a "This closes #" message somewhere in their log. The
>>> PR process for the ASF's GitHub mirrors works essentially the same for
>>> the svn based repos as it does for the Git based repos (asuming you
>>> are actually using git-svn, which I believe many/most folks are?).
>>>
>>> Robbie
>>>
>>> On 30 January 2017 at 11:51, Lorenz Quack <quack.lor...@gmail.com> wrote:
>>>> I think it is different for different components of Qpid.
>>>>
>>>> The Qpid broker for Java for example has not migrated its main repository 
>>>> to
>>>> git.
>>>> Also the GitHub mirror is treated as read-only. And it is quite possible
>&g

Re: Patch + jira vs pull request

2017-02-06 Thread Robbie Gemmell 
As an aside, for anyone else wanting to do this type of thing, I used
this to add a remote called 'github' to my existing checkout and make
the PRs available at ref github/pr/:

git remote add github https://github.com/apache/qpid-java.git
git config --local --add remote.github.fetch
'+refs/pull/*/head:refs/remotes/github/pr/*'
git fetch --all

To use a different name for the remote, find/replace instances of
github other than in the mirror URL with your chosen remote name. To
use another repo, change the name in the URL.

Robbie

On 31 January 2017 at 12:26, Robbie Gemmell  wrote:
> This is now enabled, see
> https://issues.apache.org/jira/browse/QPID-7650 and
> https://github.com/apache/qpid-java/pull/5 as example.
>
> Note that the mails to the dev@ list were still not seen, as something
> seems to be wrong with the list, or at least JIRA. No mails from JIRA
> are arriving, even though I have been receiving the matching/duplicate
> mails sent directly to me. Raised as
> https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
> infra, likely related to the very recent JIRA upgrade. I'll give the
> PR thing another check once its clearer what the issues are.
>
> Also, while the process of closing the PR worked fine, it did take a
> good 20+mins for the commit to make it to the github mirror (via the
> asf git mirror, via svn) and close it, as opposed to the near instant
> updates normally seen when using the git repositories.
>
> Robbie
>
> On 30 January 2017 at 13:19, Robbie Gemmell  wrote:
>> Saying that made me look, and it seems like the GitHub integration is
>> indeed not enabled on the apache/qpid-java mirror. There are a few old
>> open Pull Requests and one test PR open+closed (nice account Lorenz
>> :P), none of which have been visible on the list. I raised
>> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
>> mails/JIRA comments integration enabled for the repo.
>>
>> Robbie
>>
>> On 30 January 2017 at 12:28, Robbie Gemmell  wrote:
>>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
>>> the same for us in the end (almost identical if you really want, since
>>> you can get a patch by adding .patch to github pr/diff/commit URLs).
>>>
>>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
>>> that would be an oversight) on the particular GitHub mirror in
>>> question, raising a PR generates a mail to the dev@ mailing list, and
>>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
>>> then a comment will also be placed on the JIRA for the open/close and
>>> any PR comments. The JIRA key should also be included in the commit so
>>> that once merged the JIRA is updated with details of the actual commit
>>> (see existing commits/JIRAs). We cant click the typical 'merge pr'
>>> button on GitHub at this time, as the mirrors are read only, but we
>>> can add the mirrors as remotes for our existing checkouts and
>>> merge+push PR commits to the source repo which then get mirrored
>>> similarly. PRs are marked merged automatically if their commit history
>>> became the unmodified head at the time of merge, but more safely can
>>> be closed out by a commit (either the specific one with the changes,
>>> or a merge commit introducing the original, or just an empty commit)
>>> containing a "This closes #" message somewhere in their log. The
>>> PR process for the ASF's GitHub mirrors works essentially the same for
>>> the svn based repos as it does for the Git based repos (asuming you
>>> are actually using git-svn, which I believe many/most folks are?).
>>>
>>> Robbie
>>>
>>> On 30 January 2017 at 11:51, Lorenz Quack  wrote:
 I think it is different for different components of Qpid.

 The Qpid broker for Java for example has not migrated its main repository 
 to
 git.
 Also the GitHub mirror is treated as read-only. And it is quite possible
 that pull request might go unnoticed.
 So, for the Qpid broker for Java component I would recommend for the time
 being to use JIRA/patches/email.

 Kind regards,
 Lorenz


 On 30/01/17 10:56, Chris Richardson wrote:
>
> I have been wondering about this too and would definitely give a +1 to the
> pull request approach if it's an option.
>
> /C
>
>
> On 28 January 2017 at 08:51, Adel Boutros  wrote:
>
>> Hello,
>>
>> For some time we have been submitting jira issues with patches for
>> problems we have detected. However, it is also possible to perform a pull
>> request on the github repositories.
>>
>> So I was wondering which method you prefer and why?
>>
>> Regards,
>> Adel
>>
>
>


 -
 To unsubscribe, e-mail:

Re: Patch + jira vs pull request

2017-01-31 Thread Robbie Gemmell 
Slight retraction...JIRA mails will be getting blocked again right
now, JIRA will need restarted to adjust the mails going forward.

Robbie

On 31 January 2017 at 16:21, Robbie Gemmell  wrote:
> There was an issue with the github setup, with the 'qpid-java' mirror
> repo combined with 'qpid' svn sub-repo complicating matters, but that
> should be fixed now.
>
> The dev@ list was blockingthe JIRA traffic due to the format of the
> JIRA mails changing during the upgrade, those mails should now also be
> getting through.
>
> Robbie
>
> On 31 January 2017 at 12:26, Robbie Gemmell  wrote:
>> This is now enabled, see
>> https://issues.apache.org/jira/browse/QPID-7650 and
>> https://github.com/apache/qpid-java/pull/5 as example.
>>
>> Note that the mails to the dev@ list were still not seen, as something
>> seems to be wrong with the list, or at least JIRA. No mails from JIRA
>> are arriving, even though I have been receiving the matching/duplicate
>> mails sent directly to me. Raised as
>> https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
>> infra, likely related to the very recent JIRA upgrade. I'll give the
>> PR thing another check once its clearer what the issues are.
>>
>> Also, while the process of closing the PR worked fine, it did take a
>> good 20+mins for the commit to make it to the github mirror (via the
>> asf git mirror, via svn) and close it, as opposed to the near instant
>> updates normally seen when using the git repositories.
>>
>> Robbie
>>
>> On 30 January 2017 at 13:19, Robbie Gemmell  wrote:
>>> Saying that made me look, and it seems like the GitHub integration is
>>> indeed not enabled on the apache/qpid-java mirror. There are a few old
>>> open Pull Requests and one test PR open+closed (nice account Lorenz
>>> :P), none of which have been visible on the list. I raised
>>> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
>>> mails/JIRA comments integration enabled for the repo.
>>>
>>> Robbie
>>>
>>> On 30 January 2017 at 12:28, Robbie Gemmell  
>>> wrote:
 JIRA+PR or JIRA+patch, either approach is fine and works out largely
 the same for us in the end (almost identical if you really want, since
 you can get a patch by adding .patch to github pr/diff/commit URLs).

 Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
 that would be an oversight) on the particular GitHub mirror in
 question, raising a PR generates a mail to the dev@ mailing list, and
 if the JIRA key is in the PR title (e.g "QPID-1234:short description")
 then a comment will also be placed on the JIRA for the open/close and
 any PR comments. The JIRA key should also be included in the commit so
 that once merged the JIRA is updated with details of the actual commit
 (see existing commits/JIRAs). We cant click the typical 'merge pr'
 button on GitHub at this time, as the mirrors are read only, but we
 can add the mirrors as remotes for our existing checkouts and
 merge+push PR commits to the source repo which then get mirrored
 similarly. PRs are marked merged automatically if their commit history
 became the unmodified head at the time of merge, but more safely can
 be closed out by a commit (either the specific one with the changes,
 or a merge commit introducing the original, or just an empty commit)
 containing a "This closes #" message somewhere in their log. The
 PR process for the ASF's GitHub mirrors works essentially the same for
 the svn based repos as it does for the Git based repos (asuming you
 are actually using git-svn, which I believe many/most folks are?).

 Robbie

 On 30 January 2017 at 11:51, Lorenz Quack  wrote:
> I think it is different for different components of Qpid.
>
> The Qpid broker for Java for example has not migrated its main repository 
> to
> git.
> Also the GitHub mirror is treated as read-only. And it is quite possible
> that pull request might go unnoticed.
> So, for the Qpid broker for Java component I would recommend for the time
> being to use JIRA/patches/email.
>
> Kind regards,
> Lorenz
>
>
> On 30/01/17 10:56, Chris Richardson wrote:
>>
>> I have been wondering about this too and would definitely give a +1 to 
>> the
>> pull request approach if it's an option.
>>
>> /C
>>
>>
>> On 28 January 2017 at 08:51, Adel Boutros  wrote:
>>
>>> Hello,
>>>
>>> For some time we have been submitting jira issues with patches for
>>> problems we have detected. However, it is also possible to perform a 
>>> pull
>>> request on the github repositories.
>>>
>>> So I was wondering which method you prefer and why?
>>>
>>> Regards,
>>> Adel
>>>

Re: Patch + jira vs pull request

2017-01-31 Thread Robbie Gemmell 
There was an issue with the github setup, with the 'qpid-java' mirror
repo combined with 'qpid' svn sub-repo complicating matters, but that
should be fixed now.

The dev@ list was blockingthe JIRA traffic due to the format of the
JIRA mails changing during the upgrade, those mails should now also be
getting through.

Robbie

On 31 January 2017 at 12:26, Robbie Gemmell  wrote:
> This is now enabled, see
> https://issues.apache.org/jira/browse/QPID-7650 and
> https://github.com/apache/qpid-java/pull/5 as example.
>
> Note that the mails to the dev@ list were still not seen, as something
> seems to be wrong with the list, or at least JIRA. No mails from JIRA
> are arriving, even though I have been receiving the matching/duplicate
> mails sent directly to me. Raised as
> https://issues.apache.org/jira/browse/INFRA-13432 after chatting to
> infra, likely related to the very recent JIRA upgrade. I'll give the
> PR thing another check once its clearer what the issues are.
>
> Also, while the process of closing the PR worked fine, it did take a
> good 20+mins for the commit to make it to the github mirror (via the
> asf git mirror, via svn) and close it, as opposed to the near instant
> updates normally seen when using the git repositories.
>
> Robbie
>
> On 30 January 2017 at 13:19, Robbie Gemmell  wrote:
>> Saying that made me look, and it seems like the GitHub integration is
>> indeed not enabled on the apache/qpid-java mirror. There are a few old
>> open Pull Requests and one test PR open+closed (nice account Lorenz
>> :P), none of which have been visible on the list. I raised
>> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
>> mails/JIRA comments integration enabled for the repo.
>>
>> Robbie
>>
>> On 30 January 2017 at 12:28, Robbie Gemmell  wrote:
>>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
>>> the same for us in the end (almost identical if you really want, since
>>> you can get a patch by adding .patch to github pr/diff/commit URLs).
>>>
>>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
>>> that would be an oversight) on the particular GitHub mirror in
>>> question, raising a PR generates a mail to the dev@ mailing list, and
>>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
>>> then a comment will also be placed on the JIRA for the open/close and
>>> any PR comments. The JIRA key should also be included in the commit so
>>> that once merged the JIRA is updated with details of the actual commit
>>> (see existing commits/JIRAs). We cant click the typical 'merge pr'
>>> button on GitHub at this time, as the mirrors are read only, but we
>>> can add the mirrors as remotes for our existing checkouts and
>>> merge+push PR commits to the source repo which then get mirrored
>>> similarly. PRs are marked merged automatically if their commit history
>>> became the unmodified head at the time of merge, but more safely can
>>> be closed out by a commit (either the specific one with the changes,
>>> or a merge commit introducing the original, or just an empty commit)
>>> containing a "This closes #" message somewhere in their log. The
>>> PR process for the ASF's GitHub mirrors works essentially the same for
>>> the svn based repos as it does for the Git based repos (asuming you
>>> are actually using git-svn, which I believe many/most folks are?).
>>>
>>> Robbie
>>>
>>> On 30 January 2017 at 11:51, Lorenz Quack  wrote:
 I think it is different for different components of Qpid.

 The Qpid broker for Java for example has not migrated its main repository 
 to
 git.
 Also the GitHub mirror is treated as read-only. And it is quite possible
 that pull request might go unnoticed.
 So, for the Qpid broker for Java component I would recommend for the time
 being to use JIRA/patches/email.

 Kind regards,
 Lorenz


 On 30/01/17 10:56, Chris Richardson wrote:
>
> I have been wondering about this too and would definitely give a +1 to the
> pull request approach if it's an option.
>
> /C
>
>
> On 28 January 2017 at 08:51, Adel Boutros  wrote:
>
>> Hello,
>>
>> For some time we have been submitting jira issues with patches for
>> problems we have detected. However, it is also possible to perform a pull
>> request on the github repositories.
>>
>> So I was wondering which method you prefer and why?
>>
>> Regards,
>> Adel
>>
>
>


 -
 To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
 For additional commands, e-mail: users-h...@qpid.apache.org


-
To unsubscribe, e-mail:

Re: Patch + jira vs pull request

2017-01-30 Thread Andrew Stitcher 
On Mon, 2017-01-30 at 10:56 +, Chris Richardson wrote:
> I have been wondering about this too and would definitely give a +1
> to the
> pull request approach if it's an option.

I'd just like to add to what Robbie said:

Either a patch attached to a JIRA issue or a github PR work well as a
means for getting a small (few line) change upstream.

However for a larger change (at least for the C/C++ qpid projects) we
like to review changes so that means either using reviewboard or a
Github PR.

As Robbie implied our primary issue tracking system is JIRA (not
Github) so creating a JIRA and mentioning it in any commit message or
PR message is pretty much required.

Anyway the upshot from my POV is that if you want to use a Github PR to
 send work upstream that's great. But we'd really (really, really) like
there to be an associated JIRA too and for the git commits (and Github
PR) to mention it.

HTH

Andrew


-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Lorenz Quack 

Thanks Robbie.


On 30/01/17 13:19, Robbie Gemmell wrote:

Saying that made me look, and it seems like the GitHub integration is
indeed not enabled on the apache/qpid-java mirror. There are a few old
open Pull Requests and one test PR open+closed (nice account Lorenz
:P), none of which have been visible on the list. I raised
https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
mails/JIRA comments integration enabled for the repo.

Robbie

On 30 January 2017 at 12:28, Robbie Gemmell  wrote:

JIRA+PR or JIRA+patch, either approach is fine and works out largely
the same for us in the end (almost identical if you really want, since
you can get a patch by adding .patch to github pr/diff/commit URLs).

Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
that would be an oversight) on the particular GitHub mirror in
question, raising a PR generates a mail to the dev@ mailing list, and
if the JIRA key is in the PR title (e.g "QPID-1234:short description")
then a comment will also be placed on the JIRA for the open/close and
any PR comments. The JIRA key should also be included in the commit so
that once merged the JIRA is updated with details of the actual commit
(see existing commits/JIRAs). We cant click the typical 'merge pr'
button on GitHub at this time, as the mirrors are read only, but we
can add the mirrors as remotes for our existing checkouts and
merge+push PR commits to the source repo which then get mirrored
similarly. PRs are marked merged automatically if their commit history
became the unmodified head at the time of merge, but more safely can
be closed out by a commit (either the specific one with the changes,
or a merge commit introducing the original, or just an empty commit)
containing a "This closes #" message somewhere in their log. The
PR process for the ASF's GitHub mirrors works essentially the same for
the svn based repos as it does for the Git based repos (asuming you
are actually using git-svn, which I believe many/most folks are?).

Robbie

On 30 January 2017 at 11:51, Lorenz Quack  wrote:

I think it is different for different components of Qpid.

The Qpid broker for Java for example has not migrated its main repository to
git.
Also the GitHub mirror is treated as read-only. And it is quite possible
that pull request might go unnoticed.
So, for the Qpid broker for Java component I would recommend for the time
being to use JIRA/patches/email.

Kind regards,
Lorenz


On 30/01/17 10:56, Chris Richardson wrote:

I have been wondering about this too and would definitely give a +1 to the
pull request approach if it's an option.

/C


On 28 January 2017 at 08:51, Adel Boutros  wrote:


Hello,

For some time we have been submitting jira issues with patches for
problems we have detected. However, it is also possible to perform a pull
request on the github repositories.

So I was wondering which method you prefer and why?

Regards,
Adel





-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org


-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org




-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Robbie Gemmell 
Hi Adel,

Sorry, no, that and everything from the bit about the GitHub PR merge
button was essentially meant for other committers, i.e. folks
ultimately interacting with the qpid svn repository though based on
prior experience/discussion probably through using git-svn to do their
work locally first.

Robbie

On 30 January 2017 at 15:23, Adel Boutros <adelbout...@live.com> wrote:
> Hello Robbie,
>
>
> I don't know if your question "asuming you are actually using git-svn, which 
> I believe many/most folks are?" was addressed to me or not.
>
> However, in our case we use basically Atlassian Stash (now known as Bitbucket 
> Server) when mirroring the Qpid repositories.
>
>
> Regards,
>
> Adel
>
> 
> From: Robbie Gemmell <robbie.gemm...@gmail.com>
> Sent: Monday, January 30, 2017 2:19:24 PM
> To: users@qpid.apache.org
> Subject: Re: Patch + jira vs pull request
>
> Saying that made me look, and it seems like the GitHub integration is
> indeed not enabled on the apache/qpid-java mirror. There are a few old
> open Pull Requests and one test PR open+closed (nice account Lorenz
> :P), none of which have been visible on the list. I raised
> https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
> mails/JIRA comments integration enabled for the repo.
>
> Robbie
>
> On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
>> JIRA+PR or JIRA+patch, either approach is fine and works out largely
>> the same for us in the end (almost identical if you really want, since
>> you can get a patch by adding .patch to github pr/diff/commit URLs).
>>
>> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
>> that would be an oversight) on the particular GitHub mirror in
>> question, raising a PR generates a mail to the dev@ mailing list, and
>> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
>> then a comment will also be placed on the JIRA for the open/close and
>> any PR comments. The JIRA key should also be included in the commit so
>> that once merged the JIRA is updated with details of the actual commit
>> (see existing commits/JIRAs). We cant click the typical 'merge pr'
>> button on GitHub at this time, as the mirrors are read only, but we
>> can add the mirrors as remotes for our existing checkouts and
>> merge+push PR commits to the source repo which then get mirrored
>> similarly. PRs are marked merged automatically if their commit history
>> became the unmodified head at the time of merge, but more safely can
>> be closed out by a commit (either the specific one with the changes,
>> or a merge commit introducing the original, or just an empty commit)
>> containing a "This closes #" message somewhere in their log. The
>> PR process for the ASF's GitHub mirrors works essentially the same for
>> the svn based repos as it does for the Git based repos (asuming you
>> are actually using git-svn, which I believe many/most folks are?).
>>
>> Robbie
>>
>> On 30 January 2017 at 11:51, Lorenz Quack <quack.lor...@gmail.com> wrote:
>>> I think it is different for different components of Qpid.
>>>
>>> The Qpid broker for Java for example has not migrated its main repository to
>>> git.
>>> Also the GitHub mirror is treated as read-only. And it is quite possible
>>> that pull request might go unnoticed.
>>> So, for the Qpid broker for Java component I would recommend for the time
>>> being to use JIRA/patches/email.
>>>
>>> Kind regards,
>>> Lorenz
>>>
>>>
>>> On 30/01/17 10:56, Chris Richardson wrote:
>>>>
>>>> I have been wondering about this too and would definitely give a +1 to the
>>>> pull request approach if it's an option.
>>>>
>>>> /C
>>>>
>>>>
>>>> On 28 January 2017 at 08:51, Adel Boutros <adelbout...@live.com> wrote:
>>>>
>>>>> Hello,
>>>>>
>>>>> For some time we have been submitting jira issues with patches for
>>>>> problems we have detected. However, it is also possible to perform a pull
>>>>> request on the github repositories.
>>>>>
>>>>> So I was wondering which method you prefer and why?
>>>>>
>>>>> Regards,
>>>>> Adel
>>>>>
>>>>
>>>>
>>>
>>>
>>> -
>>> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
>>> For additional commands, e-mail: users-h...@qpid.apache.org
>>>
>
> -
> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
> For additional commands, e-mail: users-h...@qpid.apache.org
>

-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Adel Boutros 
Hello Robbie,


I don't know if your question "asuming you are actually using git-svn, which I 
believe many/most folks are?" was addressed to me or not.

However, in our case we use basically Atlassian Stash (now known as Bitbucket 
Server) when mirroring the Qpid repositories.


Regards,

Adel


From: Robbie Gemmell <robbie.gemm...@gmail.com>
Sent: Monday, January 30, 2017 2:19:24 PM
To: users@qpid.apache.org
Subject: Re: Patch + jira vs pull request

Saying that made me look, and it seems like the GitHub integration is
indeed not enabled on the apache/qpid-java mirror. There are a few old
open Pull Requests and one test PR open+closed (nice account Lorenz
:P), none of which have been visible on the list. I raised
https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
mails/JIRA comments integration enabled for the repo.

Robbie

On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com> wrote:
> JIRA+PR or JIRA+patch, either approach is fine and works out largely
> the same for us in the end (almost identical if you really want, since
> you can get a patch by adding .patch to github pr/diff/commit URLs).
>
> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
> that would be an oversight) on the particular GitHub mirror in
> question, raising a PR generates a mail to the dev@ mailing list, and
> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
> then a comment will also be placed on the JIRA for the open/close and
> any PR comments. The JIRA key should also be included in the commit so
> that once merged the JIRA is updated with details of the actual commit
> (see existing commits/JIRAs). We cant click the typical 'merge pr'
> button on GitHub at this time, as the mirrors are read only, but we
> can add the mirrors as remotes for our existing checkouts and
> merge+push PR commits to the source repo which then get mirrored
> similarly. PRs are marked merged automatically if their commit history
> became the unmodified head at the time of merge, but more safely can
> be closed out by a commit (either the specific one with the changes,
> or a merge commit introducing the original, or just an empty commit)
> containing a "This closes #" message somewhere in their log. The
> PR process for the ASF's GitHub mirrors works essentially the same for
> the svn based repos as it does for the Git based repos (asuming you
> are actually using git-svn, which I believe many/most folks are?).
>
> Robbie
>
> On 30 January 2017 at 11:51, Lorenz Quack <quack.lor...@gmail.com> wrote:
>> I think it is different for different components of Qpid.
>>
>> The Qpid broker for Java for example has not migrated its main repository to
>> git.
>> Also the GitHub mirror is treated as read-only. And it is quite possible
>> that pull request might go unnoticed.
>> So, for the Qpid broker for Java component I would recommend for the time
>> being to use JIRA/patches/email.
>>
>> Kind regards,
>> Lorenz
>>
>>
>> On 30/01/17 10:56, Chris Richardson wrote:
>>>
>>> I have been wondering about this too and would definitely give a +1 to the
>>> pull request approach if it's an option.
>>>
>>> /C
>>>
>>>
>>> On 28 January 2017 at 08:51, Adel Boutros <adelbout...@live.com> wrote:
>>>
>>>> Hello,
>>>>
>>>> For some time we have been submitting jira issues with patches for
>>>> problems we have detected. However, it is also possible to perform a pull
>>>> request on the github repositories.
>>>>
>>>> So I was wondering which method you prefer and why?
>>>>
>>>> Regards,
>>>> Adel
>>>>
>>>
>>>
>>
>>
>> -
>> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
>> For additional commands, e-mail: users-h...@qpid.apache.org
>>

-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Robbie Gemmell 
Saying that made me look, and it seems like the GitHub integration is
indeed not enabled on the apache/qpid-java mirror. There are a few old
open Pull Requests and one test PR open+closed (nice account Lorenz
:P), none of which have been visible on the list. I raised
https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub
mails/JIRA comments integration enabled for the repo.

Robbie

On 30 January 2017 at 12:28, Robbie Gemmell  wrote:
> JIRA+PR or JIRA+patch, either approach is fine and works out largely
> the same for us in the end (almost identical if you really want, since
> you can get a patch by adding .patch to github pr/diff/commit URLs).
>
> Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
> that would be an oversight) on the particular GitHub mirror in
> question, raising a PR generates a mail to the dev@ mailing list, and
> if the JIRA key is in the PR title (e.g "QPID-1234:short description")
> then a comment will also be placed on the JIRA for the open/close and
> any PR comments. The JIRA key should also be included in the commit so
> that once merged the JIRA is updated with details of the actual commit
> (see existing commits/JIRAs). We cant click the typical 'merge pr'
> button on GitHub at this time, as the mirrors are read only, but we
> can add the mirrors as remotes for our existing checkouts and
> merge+push PR commits to the source repo which then get mirrored
> similarly. PRs are marked merged automatically if their commit history
> became the unmodified head at the time of merge, but more safely can
> be closed out by a commit (either the specific one with the changes,
> or a merge commit introducing the original, or just an empty commit)
> containing a "This closes #" message somewhere in their log. The
> PR process for the ASF's GitHub mirrors works essentially the same for
> the svn based repos as it does for the Git based repos (asuming you
> are actually using git-svn, which I believe many/most folks are?).
>
> Robbie
>
> On 30 January 2017 at 11:51, Lorenz Quack  wrote:
>> I think it is different for different components of Qpid.
>>
>> The Qpid broker for Java for example has not migrated its main repository to
>> git.
>> Also the GitHub mirror is treated as read-only. And it is quite possible
>> that pull request might go unnoticed.
>> So, for the Qpid broker for Java component I would recommend for the time
>> being to use JIRA/patches/email.
>>
>> Kind regards,
>> Lorenz
>>
>>
>> On 30/01/17 10:56, Chris Richardson wrote:
>>>
>>> I have been wondering about this too and would definitely give a +1 to the
>>> pull request approach if it's an option.
>>>
>>> /C
>>>
>>>
>>> On 28 January 2017 at 08:51, Adel Boutros  wrote:
>>>
 Hello,

 For some time we have been submitting jira issues with patches for
 problems we have detected. However, it is also possible to perform a pull
 request on the github repositories.

 So I was wondering which method you prefer and why?

 Regards,
 Adel

>>>
>>>
>>
>>
>> -
>> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
>> For additional commands, e-mail: users-h...@qpid.apache.org
>>

-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Robbie Gemmell 
JIRA+PR or JIRA+patch, either approach is fine and works out largely
the same for us in the end (almost identical if you really want, since
you can get a patch by adding .patch to github pr/diff/commit URLs).

Assuming the 'GitHub integration' stuff is enabled (and if it isn't,
that would be an oversight) on the particular GitHub mirror in
question, raising a PR generates a mail to the dev@ mailing list, and
if the JIRA key is in the PR title (e.g "QPID-1234:short description")
then a comment will also be placed on the JIRA for the open/close and
any PR comments. The JIRA key should also be included in the commit so
that once merged the JIRA is updated with details of the actual commit
(see existing commits/JIRAs). We cant click the typical 'merge pr'
button on GitHub at this time, as the mirrors are read only, but we
can add the mirrors as remotes for our existing checkouts and
merge+push PR commits to the source repo which then get mirrored
similarly. PRs are marked merged automatically if their commit history
became the unmodified head at the time of merge, but more safely can
be closed out by a commit (either the specific one with the changes,
or a merge commit introducing the original, or just an empty commit)
containing a "This closes #" message somewhere in their log. The
PR process for the ASF's GitHub mirrors works essentially the same for
the svn based repos as it does for the Git based repos (asuming you
are actually using git-svn, which I believe many/most folks are?).

Robbie

On 30 January 2017 at 11:51, Lorenz Quack  wrote:
> I think it is different for different components of Qpid.
>
> The Qpid broker for Java for example has not migrated its main repository to
> git.
> Also the GitHub mirror is treated as read-only. And it is quite possible
> that pull request might go unnoticed.
> So, for the Qpid broker for Java component I would recommend for the time
> being to use JIRA/patches/email.
>
> Kind regards,
> Lorenz
>
>
> On 30/01/17 10:56, Chris Richardson wrote:
>>
>> I have been wondering about this too and would definitely give a +1 to the
>> pull request approach if it's an option.
>>
>> /C
>>
>>
>> On 28 January 2017 at 08:51, Adel Boutros  wrote:
>>
>>> Hello,
>>>
>>> For some time we have been submitting jira issues with patches for
>>> problems we have detected. However, it is also possible to perform a pull
>>> request on the github repositories.
>>>
>>> So I was wondering which method you prefer and why?
>>>
>>> Regards,
>>> Adel
>>>
>>
>>
>
>
> -
> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
> For additional commands, e-mail: users-h...@qpid.apache.org
>

-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Lorenz Quack 

I think it is different for different components of Qpid.

The Qpid broker for Java for example has not migrated its main 
repository to git.
Also the GitHub mirror is treated as read-only. And it is quite possible 
that pull request might go unnoticed.
So, for the Qpid broker for Java component I would recommend for the 
time being to use JIRA/patches/email.


Kind regards,
Lorenz


On 30/01/17 10:56, Chris Richardson wrote:

I have been wondering about this too and would definitely give a +1 to the
pull request approach if it's an option.

/C


On 28 January 2017 at 08:51, Adel Boutros  wrote:


Hello,

For some time we have been submitting jira issues with patches for
problems we have detected. However, it is also possible to perform a pull
request on the github repositories.

So I was wondering which method you prefer and why?

Regards,
Adel







-
To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org
For additional commands, e-mail: users-h...@qpid.apache.org

Re: Patch + jira vs pull request

2017-01-30 Thread Chris Richardson 
I have been wondering about this too and would definitely give a +1 to the
pull request approach if it's an option.

/C


On 28 January 2017 at 08:51, Adel Boutros  wrote:

> Hello,
>
> For some time we have been submitting jira issues with patches for
> problems we have detected. However, it is also possible to perform a pull
> request on the github repositories.
>
> So I was wondering which method you prefer and why?
>
> Regards,
> Adel
>



-- 

*Chris Richardson*, System Architect
c...@fourc.eu


*FourC AS, Vestre Rosten 81, Trekanten, NO-7075 Tiller, Norwaywww.fourc.eu
*

*Follow us on LinkedIn , Facebook
, Google+  and Twitter
!*

Patch + jira vs pull request

2017-01-28 Thread Adel Boutros 
Hello,

For some time we have been submitting jira issues with patches for problems we 
have detected. However, it is also possible to perform a pull request on the 
github repositories.

So I was wondering which method you prefer and why?

Regards,
Adel