You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2015/03/09 18:52:06 UTC
activemq git commit: Add MERIT.txt and give thanks to Mark Frazier
for his contribution.
Repository: activemq
Updated Branches:
refs/heads/master e25a6aa8a -> b9b566918
Add MERIT.txt and give thanks to Mark Frazier for his contribution.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b9b56691
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b9b56691
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b9b56691
Branch: refs/heads/master
Commit: b9b566918e4e0ce0c33e0a4f73aff7551b7d6c66
Parents: e25a6aa
Author: artnaseef <ar...@apache.org>
Authored: Mon Mar 9 10:50:59 2015 -0700
Committer: artnaseef <ar...@apache.org>
Committed: Mon Mar 9 10:51:51 2015 -0700
----------------------------------------------------------------------
MERIT.txt | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b9b56691/MERIT.txt
----------------------------------------------------------------------
diff --git a/MERIT.txt b/MERIT.txt
new file mode 100644
index 0000000..1cec26b
--- /dev/null
+++ b/MERIT.txt
@@ -0,0 +1,15 @@
+OVERVIEW
+========
+
+This file contains thanks to contributors. Not all contributions are here, but
+this file acts as a place to give thanks to those whose contributions are not
+otherwise reflected in source code commits.
+
+
+MERIT
+=====
+
+Commit: 3ef8f492a7cb9c056ac1883ccb069e9559fc6b22
+ Author: Mark Frazier
+ Message: Thank you for the patch provided here:
+ https://issues.apache.org/jira/browse/AMQ-5563
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
This file is intended to catch missed commit credit. Reverting and
re-applying commits to correct commit messages could get very messy, so this
seems like a good compromise - a place to edit and create another commit and
refer back to the original.
Why it is important not to have MERIT.txt in the source code?
Art
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692816.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
Oh, and please recommend alternatives - I'm open to ideas.
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692824.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
I see. The file itself does not create any bureaucracy. As the comments in
the file indicate, it's a place for otherwise-missed-credit.
I really think it's valid in that way. I don't see how the number of
entries in the file is important to the issue.
And, yes, missing credit on an individual commit can be an issue. However,
a bigger concern is that 1 leads to 2 and then more. I know.
We don't need to be perfect, but we should strive to improve and do our best
always.
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692821.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by Clebert Suconic <cl...@gmail.com>.
I didn't mean for you to add the history on the file..
I just mean to add you as @author
And at the commit comment you explain why you are the author.
Now if the commit wasn't enough to grant you authorship (i.e add
@author at the file that currently don't have it).. then there are no
issues IMO. The contributor can just wait his next contribution.
On Mon, Mar 9, 2015 at 3:12 PM, artnaseef <ar...@artnaseef.com> wrote:
> I like the Pull Request model and try to encourage folks to use it always.
> Using it for feedback sounds like a great way to go. If every contribution
> where made through a pull request, and committers always applied all
> contributions by merging the pull requests, there would be no need for this
> file.
>
> As for editing individual files and using @author, I would prefer to avoid
> that path as comments in a file about its history can lead to extra "noise"
> in the form of more history to correct past history. Furthermore, using
> commit IDs as references helps to clarify just what was done; they
> definitely do not belong inside an individual source file that is a
> functional part of the working software.
>
> I see a single text file, in which small comments can be added, as very
> lightweight - easy to use, and right "on point" (i.e. in the code base to
> which the update was made). And, if all goes well, it never gets used
> because the commit messages should suffice.
>
> We could do the same thing with a page on the ActiveMQ website, but updating
> that website is harder in my experience. It also splits the history into
> two places (one in GIT and one on the website). As a developer applying a
> contribution, I'm already in GIT, so making a second edit there is "at the
> right place and the right time."
>
>
>
> --
> View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692830.html
> Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
--
Clebert Suconic
http://community.jboss.org/people/clebert.suconic@jboss.com
http://clebertsuconic.blogspot.com
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier for his contribution.
Posted by Daniel Kulp <dk...@apache.org>.
> On Mar 9, 2015, at 3:55 PM, artnaseef <ar...@artnaseef.com> wrote:
>
> Let me clarify here. The MERIT.txt file is a way to give credit to someone
> when that credit was missed earlier. Ideally, credit is given through the
> original commit, either by using a pull request - thereby giving direct
> credit in the GIT history, or by the commit comment.
Another alternative:
Revert the commit and then re-apply with the appropriate commit log. Yes, that would “pollute” the history with reverts and such, but I would sure hope this is a rare occurrence.
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
Actually, I didn't realize you could create an "empty" commit. I like that
better - it's "in-line" with the rest of the commit history.
I'll revert this commit and add an empty one with the appropriate comment.
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692842.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier
for his contribution.
Posted by Hadrian Zbarcea <hz...@gmail.com>.
Did you consider other solutions? Like `git commit --allow-empty`, for
instance?
Hadrian
On 03/09/2015 03:55 PM, artnaseef wrote:
> Let me clarify here. The MERIT.txt file is a way to give credit to someone
> when that credit was missed earlier. Ideally, credit is given through the
> original commit, either by using a pull request - thereby giving direct
> credit in the GIT history, or by the commit comment.
>
>
>
> --
> View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692836.html
> Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
>
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
Let me clarify here. The MERIT.txt file is a way to give credit to someone
when that credit was missed earlier. Ideally, credit is given through the
original commit, either by using a pull request - thereby giving direct
credit in the GIT history, or by the commit comment.
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692836.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by artnaseef <ar...@artnaseef.com>.
I like the Pull Request model and try to encourage folks to use it always.
Using it for feedback sounds like a great way to go. If every contribution
where made through a pull request, and committers always applied all
contributions by merging the pull requests, there would be no need for this
file.
As for editing individual files and using @author, I would prefer to avoid
that path as comments in a file about its history can lead to extra "noise"
in the form of more history to correct past history. Furthermore, using
commit IDs as references helps to clarify just what was done; they
definitely do not belong inside an individual source file that is a
functional part of the working software.
I see a single text file, in which small comments can be added, as very
lightweight - easy to use, and right "on point" (i.e. in the code base to
which the update was made). And, if all goes well, it never gets used
because the commit messages should suffice.
We could do the same thing with a page on the ActiveMQ website, but updating
that website is harder in my experience. It also splits the history into
two places (one in GIT and one on the website). As a developer applying a
contribution, I'm already in GIT, so making a second edit there is "at the
right place and the right time."
--
View this message in context: http://activemq.2283324.n4.nabble.com/Re-activemq-git-commit-Add-MERIT-txt-and-give-thanks-to-Mark-Frazier-for-his-contribution-tp4692815p4692830.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier for his contribution.
Posted by Daniel Kulp <dk...@apache.org>.
> On Mar 9, 2015, at 3:44 PM, Clebert Suconic <cl...@gmail.com> wrote:
>
> On Mon, Mar 9, 2015 at 3:38 PM, Daniel Kulp <dk...@apache.org> wrote:
>>
>> Please don’t use @author tags…. Highly discouraged at apache as it implies some level of “ownership” over the file. If I see @author tags in files I’m in, I tend to remove them.
>
>
> Really? owner != author!
No, but there is definitely an implied relationship.
But it doesn’t really matter. This was discussed at the BOARD level at Apache a long time ago and the board has declared they should be discouraged. See: (Special order D)
http://www.apache.org/foundation/records/minutes/2004/board_minutes_2004_02_18.txt
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by Clebert Suconic <cl...@gmail.com>.
On Mon, Mar 9, 2015 at 3:38 PM, Daniel Kulp <dk...@apache.org> wrote:
>
> Please don’t use @author tags…. Highly discouraged at apache as it implies some level of “ownership” over the file. If I see @author tags in files I’m in, I tend to remove them.
Really? owner != author!
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier for his contribution.
Posted by Daniel Kulp <dk...@apache.org>.
Please don’t use @author tags…. Highly discouraged at apache as it implies some level of “ownership” over the file. If I see @author tags in files I’m in, I tend to remove them.
Dan
> On Mar 9, 2015, at 2:45 PM, Clebert Suconic <cl...@gmail.com> wrote:
>
> just an idea...
>
>
> you could see a comment to ActiveMQConfiguration with an @author tag,
> and explain what you did in the past?
>
>
>
> For things like this we are loving the Pull Request workflow we are
> using on activemq6 repo. You criticize such commits before they enter
> the source history through a lightweight workflow.
>
> On Mon, Mar 9, 2015 at 1:59 PM, Hadrian Zbarcea <hz...@gmail.com> wrote:
>> -1. Please remove. Does not belong in the code repository.
>> I agree that credit should be given, but imo this is not the way.
>>
>> Hadrian
>>
>>
>>
>> On 03/09/2015 01:52 PM, artnaseef@apache.org wrote:
>>>
>>> Repository: activemq
>>> Updated Branches:
>>> refs/heads/master e25a6aa8a -> b9b566918
>>>
>>>
>>> Add MERIT.txt and give thanks to Mark Frazier for his contribution.
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b9b56691
>>> Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b9b56691
>>> Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b9b56691
>>>
>>> Branch: refs/heads/master
>>> Commit: b9b566918e4e0ce0c33e0a4f73aff7551b7d6c66
>>> Parents: e25a6aa
>>> Author: artnaseef <ar...@apache.org>
>>> Authored: Mon Mar 9 10:50:59 2015 -0700
>>> Committer: artnaseef <ar...@apache.org>
>>> Committed: Mon Mar 9 10:51:51 2015 -0700
>>>
>>> ----------------------------------------------------------------------
>>> MERIT.txt | 15 +++++++++++++++
>>> 1 file changed, 15 insertions(+)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/activemq/blob/b9b56691/MERIT.txt
>>> ----------------------------------------------------------------------
>>> diff --git a/MERIT.txt b/MERIT.txt
>>> new file mode 100644
>>> index 0000000..1cec26b
>>> --- /dev/null
>>> +++ b/MERIT.txt
>>> @@ -0,0 +1,15 @@
>>> +OVERVIEW
>>> +========
>>> +
>>> +This file contains thanks to contributors. Not all contributions are
>>> here, but
>>> +this file acts as a place to give thanks to those whose contributions are
>>> not
>>> +otherwise reflected in source code commits.
>>> +
>>> +
>>> +MERIT
>>> +=====
>>> +
>>> +Commit: 3ef8f492a7cb9c056ac1883ccb069e9559fc6b22
>>> + Author: Mark Frazier
>>> + Message: Thank you for the patch provided here:
>>> + https://issues.apache.org/jira/browse/AMQ-5563
>>>
>>
>
>
>
> --
> Clebert Suconic
> http://community.jboss.org/people/clebert.suconic@jboss.com
> http://clebertsuconic.blogspot.com
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: activemq git commit: Add MERIT.txt and give thanks to Mark
Frazier for his contribution.
Posted by Clebert Suconic <cl...@gmail.com>.
just an idea...
you could see a comment to ActiveMQConfiguration with an @author tag,
and explain what you did in the past?
For things like this we are loving the Pull Request workflow we are
using on activemq6 repo. You criticize such commits before they enter
the source history through a lightweight workflow.
On Mon, Mar 9, 2015 at 1:59 PM, Hadrian Zbarcea <hz...@gmail.com> wrote:
> -1. Please remove. Does not belong in the code repository.
> I agree that credit should be given, but imo this is not the way.
>
> Hadrian
>
>
>
> On 03/09/2015 01:52 PM, artnaseef@apache.org wrote:
>>
>> Repository: activemq
>> Updated Branches:
>> refs/heads/master e25a6aa8a -> b9b566918
>>
>>
>> Add MERIT.txt and give thanks to Mark Frazier for his contribution.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b9b56691
>> Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b9b56691
>> Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b9b56691
>>
>> Branch: refs/heads/master
>> Commit: b9b566918e4e0ce0c33e0a4f73aff7551b7d6c66
>> Parents: e25a6aa
>> Author: artnaseef <ar...@apache.org>
>> Authored: Mon Mar 9 10:50:59 2015 -0700
>> Committer: artnaseef <ar...@apache.org>
>> Committed: Mon Mar 9 10:51:51 2015 -0700
>>
>> ----------------------------------------------------------------------
>> MERIT.txt | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/activemq/blob/b9b56691/MERIT.txt
>> ----------------------------------------------------------------------
>> diff --git a/MERIT.txt b/MERIT.txt
>> new file mode 100644
>> index 0000000..1cec26b
>> --- /dev/null
>> +++ b/MERIT.txt
>> @@ -0,0 +1,15 @@
>> +OVERVIEW
>> +========
>> +
>> +This file contains thanks to contributors. Not all contributions are
>> here, but
>> +this file acts as a place to give thanks to those whose contributions are
>> not
>> +otherwise reflected in source code commits.
>> +
>> +
>> +MERIT
>> +=====
>> +
>> +Commit: 3ef8f492a7cb9c056ac1883ccb069e9559fc6b22
>> + Author: Mark Frazier
>> + Message: Thank you for the patch provided here:
>> + https://issues.apache.org/jira/browse/AMQ-5563
>>
>
--
Clebert Suconic
http://community.jboss.org/people/clebert.suconic@jboss.com
http://clebertsuconic.blogspot.com
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier
for his contribution.
Posted by Hadrian Zbarcea <hz...@gmail.com>.
Unnecessary bureaucracy.
We should do things right and give credit during commits, not come up
with workarounds for process in code. There are other solutions. Ok, one
for Mark was missed. Hopefully he'll contribute more and it won't matter
in the great scheme of things.
In other words: how many additions to you expect to the MERIT.txt file
in the next, say, 6 months? Did you see something similar in other
projects? Is that something we want to pioneer?
To be clear, I agree with the (small) problem. I just think there are
better solutions.
Hadrian
On 03/09/2015 02:02 PM, Arthur Naseef wrote:
> This file is intended to catch missed commit credit. Reverting and
> re-applying commits to correct commit messages could get very messy, so
> this seems like a good compromise - a place to edit and create another
> commit and refer back to the original.
>
> Why it is important not to have MERIT.txt in the source code?
>
> Art
>
>
> On Mon, Mar 9, 2015 at 10:59 AM, Hadrian Zbarcea <hzbarcea@gmail.com
> <ma...@gmail.com>> wrote:
>
> -1. Please remove. Does not belong in the code repository.
> I agree that credit should be given, but imo this is not the way.
>
> Hadrian
>
>
>
> On 03/09/2015 01:52 PM, artnaseef@apache.org
> <ma...@apache.org> wrote:
>
> Repository: activemq
> Updated Branches:
> refs/heads/master e25a6aa8a -> b9b566918
>
>
> Add MERIT.txt and give thanks to Mark Frazier for his contribution.
>
>
> Project: http://git-wip-us.apache.org/__repos/asf/activemq/repo
> <http://git-wip-us.apache.org/repos/asf/activemq/repo>
> Commit:
> http://git-wip-us.apache.org/__repos/asf/activemq/commit/__b9b56691
> <http://git-wip-us.apache.org/repos/asf/activemq/commit/b9b56691>
> Tree:
> http://git-wip-us.apache.org/__repos/asf/activemq/tree/__b9b56691 <http://git-wip-us.apache.org/repos/asf/activemq/tree/b9b56691>
> Diff:
> http://git-wip-us.apache.org/__repos/asf/activemq/diff/__b9b56691 <http://git-wip-us.apache.org/repos/asf/activemq/diff/b9b56691>
>
> Branch: refs/heads/master
> Commit: b9b566918e4e0ce0c33e0a4f73aff7__551b7d6c66
> Parents: e25a6aa
> Author: artnaseef <artnaseef@apache.org
> <ma...@apache.org>>
> Authored: Mon Mar 9 10:50:59 2015 -0700
> Committer: artnaseef <artnaseef@apache.org
> <ma...@apache.org>>
> Committed: Mon Mar 9 10:51:51 2015 -0700
>
> ------------------------------__------------------------------__----------
> MERIT.txt | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
> ------------------------------__------------------------------__----------
>
>
> http://git-wip-us.apache.org/__repos/asf/activemq/blob/__b9b56691/MERIT.txt
> <http://git-wip-us.apache.org/repos/asf/activemq/blob/b9b56691/MERIT.txt>
> ------------------------------__------------------------------__----------
> diff --git a/MERIT.txt b/MERIT.txt
> new file mode 100644
> index 0000000..1cec26b
> --- /dev/null
> +++ b/MERIT.txt
> @@ -0,0 +1,15 @@
> +OVERVIEW
> +========
> +
> +This file contains thanks to contributors. Not all
> contributions are here, but
> +this file acts as a place to give thanks to those whose
> contributions are not
> +otherwise reflected in source code commits.
> +
> +
> +MERIT
> +=====
> +
> +Commit: 3ef8f492a7cb9c056ac1883ccb069e__9559fc6b22
> + Author: Mark Frazier
> + Message: Thank you for the patch provided here:
> + https://issues.apache.org/__jira/browse/AMQ-5563
> <https://issues.apache.org/jira/browse/AMQ-5563>
>
>
Re: activemq git commit: Add MERIT.txt and give thanks to Mark Frazier
for his contribution.
Posted by Hadrian Zbarcea <hz...@gmail.com>.
-1. Please remove. Does not belong in the code repository.
I agree that credit should be given, but imo this is not the way.
Hadrian
On 03/09/2015 01:52 PM, artnaseef@apache.org wrote:
> Repository: activemq
> Updated Branches:
> refs/heads/master e25a6aa8a -> b9b566918
>
>
> Add MERIT.txt and give thanks to Mark Frazier for his contribution.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
> Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b9b56691
> Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b9b56691
> Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b9b56691
>
> Branch: refs/heads/master
> Commit: b9b566918e4e0ce0c33e0a4f73aff7551b7d6c66
> Parents: e25a6aa
> Author: artnaseef <ar...@apache.org>
> Authored: Mon Mar 9 10:50:59 2015 -0700
> Committer: artnaseef <ar...@apache.org>
> Committed: Mon Mar 9 10:51:51 2015 -0700
>
> ----------------------------------------------------------------------
> MERIT.txt | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/activemq/blob/b9b56691/MERIT.txt
> ----------------------------------------------------------------------
> diff --git a/MERIT.txt b/MERIT.txt
> new file mode 100644
> index 0000000..1cec26b
> --- /dev/null
> +++ b/MERIT.txt
> @@ -0,0 +1,15 @@
> +OVERVIEW
> +========
> +
> +This file contains thanks to contributors. Not all contributions are here, but
> +this file acts as a place to give thanks to those whose contributions are not
> +otherwise reflected in source code commits.
> +
> +
> +MERIT
> +=====
> +
> +Commit: 3ef8f492a7cb9c056ac1883ccb069e9559fc6b22
> + Author: Mark Frazier
> + Message: Thank you for the patch provided here:
> + https://issues.apache.org/jira/browse/AMQ-5563
>