You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@hbase.apache.org by Andrew Purtell <ap...@apache.org> on 2014/06/03 20:47:54 UTC

[DISCUSSION] Best practice when amending commits cherry picked from master to branch

Please see the tail of HBASE-10289 and the pending commit
https://github.com/apurtell/hbase/commit/5051ad4 .

We've previously established a best practice of committing to trunk and
cherry picking back to branches whenever possible. When there is a minor
conflict we can fix it up and proceed with the commit. The resulting commit
retains the original author. When the amending author is different from the
original committer, I propose adding notice of this at the end of the
commit message as:

    Amending-Author: Author <co...@apache>

Thoughts?


-- 
Best regards,

   - Andy

Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)

Re: [DISCUSSION] Best practice when amending commits cherry picked from master to branch

Posted by Stack <st...@duboce.net>.

I added note under committing section in dev chapter referencing this
thread.
St.Ack

On Fri, Jun 6, 2014 at 2:47 PM, Enis Söztutar <en...@gmail.com> wrote:

> +1
>
>
> On Wed, Jun 4, 2014 at 5:14 PM, Elliott Clark <ec...@apache.org> wrote:
>
> > On Tue, Jun 3, 2014 at 9:03 PM, Stack <st...@duboce.net> wrote:
> >
> > > If we get a few more +1s I'll add to dev section of refguide.
> > >
> >
> > +1
> >
>

Re: [DISCUSSION] Best practice when amending commits cherry picked from master to branch

Posted by Enis Söztutar <en...@gmail.com>.

+1


On Wed, Jun 4, 2014 at 5:14 PM, Elliott Clark <ec...@apache.org> wrote:

> On Tue, Jun 3, 2014 at 9:03 PM, Stack <st...@duboce.net> wrote:
>
> > If we get a few more +1s I'll add to dev section of refguide.
> >
>
> +1
>

Re: [DISCUSSION] Best practice when amending commits cherry picked from master to branch

Posted by Elliott Clark <ec...@apache.org>.

On Tue, Jun 3, 2014 at 9:03 PM, Stack <st...@duboce.net> wrote:

> If we get a few more +1s I'll add to dev section of refguide.
>

+1

Re: [DISCUSSION] Best practice when amending commits cherry picked from master to branch

Posted by Stack <st...@duboce.net>.

+1

If we get a few more +1s I'll add to dev section of refguide.

St.Ack


On Tue, Jun 3, 2014 at 11:47 AM, Andrew Purtell <ap...@apache.org> wrote:

> Please see the tail of HBASE-10289 and the pending commit
> https://github.com/apurtell/hbase/commit/5051ad4 .
>
> We've previously established a best practice of committing to trunk and
> cherry picking back to branches whenever possible. When there is a minor
> conflict we can fix it up and proceed with the commit. The resulting commit
> retains the original author. When the amending author is different from the
> original committer, I propose adding notice of this at the end of the
> commit message as:
>
>     Amending-Author: Author <co...@apache>
>
> Thoughts?
>
>
> --
> Best regards,
>
>    - Andy
>
> Problems worthy of attack prove their worth by hitting back. - Piet Hein
> (via Tom White)
>