You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Phil Steitz <ph...@gmail.com> on 2015/03/08 23:09:07 UTC
[math][git] newbie question: best way to backport?
cherry-pick barfs because paths have changed due to package rename.
What is the best way to backport fixes to 3_X or the other way?
Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math][git] newbie question: best way to backport?
Posted by Christopher <ct...@apache.org>.
You should still be able to cherry-pick. You'll just have some work to
do to resolve the conflicts. You may be able to increase the rename
detection with:
git config merge.renameLimit 99999999
You may also be able to create a patch using "git format-patch" and
apply it using "git am -3".
--
Christopher L Tubbs II
http://gravatar.com/ctubbsii
On Sun, Mar 8, 2015 at 6:09 PM, Phil Steitz <ph...@gmail.com> wrote:
> cherry-pick barfs because paths have changed due to package rename.
> What is the best way to backport fixes to 3_X or the other way?
>
> Phil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math][git] newbie question: best way to backport?
Posted by Phil Steitz <ph...@gmail.com>.
On 3/8/15 3:34 PM, Peter Ansell wrote:
> Hi Phil,
>
> In the past I have used something like "git checkout -b temp-backport
> && git rebase -i" to squash multiple backportable commits into a
> single commit, and then it sometimes applies better (less conflicts in
> some cases) than using cherry-pick on all of the individual commits.
>
> However, that was not in cases like this where the package names are
> changed at major releases. I am not sure if you can manually edit the
> squashed diff to fix the package names and still have it apply.
Thanks, Peter!
I will try above. What I just did was just ye olde unix diff +
patch commands, hacking the diffs to fix the path names. I guess it
is a bit much to expect git to somehow figure out that s/math3/math4
is somehow to be ignored.
Phil
>
> Cheers,
>
> Peter
>
>
> On 9 March 2015 at 09:09, Phil Steitz <ph...@gmail.com> wrote:
>> cherry-pick barfs because paths have changed due to package rename.
>> What is the best way to backport fixes to 3_X or the other way?
>>
>> Phil
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>> For additional commands, e-mail: dev-help@commons.apache.org
>>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math][git] newbie question: best way to backport?
Posted by Peter Ansell <an...@gmail.com>.
Hi Phil,
In the past I have used something like "git checkout -b temp-backport
&& git rebase -i" to squash multiple backportable commits into a
single commit, and then it sometimes applies better (less conflicts in
some cases) than using cherry-pick on all of the individual commits.
However, that was not in cases like this where the package names are
changed at major releases. I am not sure if you can manually edit the
squashed diff to fix the package names and still have it apply.
Cheers,
Peter
On 9 March 2015 at 09:09, Phil Steitz <ph...@gmail.com> wrote:
> cherry-pick barfs because paths have changed due to package rename.
> What is the best way to backport fixes to 3_X or the other way?
>
> Phil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org