Looking for patch rebasing advice

Will Fiveash will.fiveash at oracle.com
Thu Jul 28 16:35:52 EDT 2016

On Thu, Jul 28, 2016 at 02:01:57PM -0400, Greg Hudson wrote:
> You probably do want to create another branch.  The following should
> create a krb5-1.14.3 branch and copy all of the downstream commits you
> made on the krb5-1.14.2 branch:
>     git checkout -b krb5-1.14.3 krb5-1.14.3-final
>     git cherry-pick krb5-1.14.2-final..krb5-1.14.2
> This isn't a "rebase" operation since you're copying the commits, not
> modifying an existing branch.
> (You might consider naming the downstream branches more explicitly, like
> krb5-1.14.2-oracle, but that's up to you.)

I took your advice and created a krb5-1.14.2-oracle branch, added and
committed all the Solaris specific patches to that branch, created and
checked out a krb5-1.14.3-oracle branch then ran:

git cherry-pick krb5-1.14.2-final..krb5-1.14.2-oracle

which appears to have updated most the Solaris patch commits so they
apply cleanly on the krb5-1.14.3-oracle branch.  I did have to manually
resolve one cherry-pick conflict but that was no big deal.

Will Fiveash
Oracle Solaris Software Engineer

More information about the krbdev mailing list