[Math] Git misc (backport)

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[Math] Git misc (backport)

Gilles Sadowski
Hi.

What is the easiest/fastest/safest way to backport changes to
the 3.x branch?

Wouldn't it be a good idea to add some info about what other
branches exist into the "doc" directory (together with the
answer to the above question)?


Thanks,
Gilles


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [Math] Git misc (backport)

James Carman
Try merging first
On Wed, Jul 8, 2015 at 7:27 AM Gilles <[hidden email]> wrote:

> Hi.
>
> What is the easiest/fastest/safest way to backport changes to
> the 3.x branch?
>
> Wouldn't it be a good idea to add some info about what other
> branches exist into the "doc" directory (together with the
> answer to the above question)?
>
>
> Thanks,
> Gilles
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: [Math] Git misc (backport)

Gilles Sadowski
On Wed, 08 Jul 2015 12:22:03 +0000, James Carman wrote:
> Try merging first
> On Wed, Jul 8, 2015 at 7:27 AM Gilles <[hidden email]>
> wrote:

Hmm.  What I need is a recipe from step _zero_:

$ git remote -v show
origin  https://git-wip-us.apache.org/repos/asf/commons-math.git 
(fetch)
origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (push)

[I.e. where is the other branch, what to copy, what not to try (e.g.
the
whole source hierarchy is different "math3" vs "math4"), etc.]

Thanks,
Gilles

>> Hi.
>>
>> What is the easiest/fastest/safest way to backport changes to
>> the 3.x branch?
>>
>> Wouldn't it be a good idea to add some info about what other
>> branches exist into the "doc" directory (together with the
>> answer to the above question)?
>>
>>
>> Thanks,
>> Gilles



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [Math] Git misc (backport)

James Ring
You should be able to see all the branches with git branch -a. You can
check them out to work on them, e.g. git checkout -b MATH_3_X
remotes/origin/MATH_3_X

How do you want to backport? Are you looking to cherry-pick individual
changes from the master branch back into 3_X? After you've checked out
3_X, you'd cherry-pick the desired changes (git cherry-pick <commit>),
fix merge conflicts, then push your changes (either back to the remote
or to your own fork of the project, when you would then create a pull
request for review).

On Wed, Jul 8, 2015 at 5:54 AM, Gilles <[hidden email]> wrote:

> On Wed, 08 Jul 2015 12:22:03 +0000, James Carman wrote:
>>
>> Try merging first
>> On Wed, Jul 8, 2015 at 7:27 AM Gilles <[hidden email]>
>> wrote:
>
>
> Hmm.  What I need is a recipe from step _zero_:
>
> $ git remote -v show
> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (fetch)
> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (push)
>
> [I.e. where is the other branch, what to copy, what not to try (e.g. the
> whole source hierarchy is different "math3" vs "math4"), etc.]
>
> Thanks,
> Gilles
>
>
>>> Hi.
>>>
>>> What is the easiest/fastest/safest way to backport changes to
>>> the 3.x branch?
>>>
>>> Wouldn't it be a good idea to add some info about what other
>>> branches exist into the "doc" directory (together with the
>>> answer to the above question)?
>>>
>>>
>>> Thanks,
>>> Gilles
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [Math] Git misc (backport)

Phil Steitz
On 7/8/15 9:00 AM, James Ring wrote:

> You should be able to see all the branches with git branch -a. You can
> check them out to work on them, e.g. git checkout -b MATH_3_X
> remotes/origin/MATH_3_X
>
> How do you want to backport? Are you looking to cherry-pick individual
> changes from the master branch back into 3_X? After you've checked out
> 3_X, you'd cherry-pick the desired changes (git cherry-pick <commit>),
> fix merge conflicts, then push your changes (either back to the remote
> or to your own fork of the project, when you would then create a pull
> request for review).

See earlier discussion on this list.  You can't cherry-pick or
automatically merge anything because of the package name change.
What I do is just manually edit the package names in the diffs and
re-apply.

+1 to doc a simple process to adjust patches for backporting /
forward-porting.

Phil

>
> On Wed, Jul 8, 2015 at 5:54 AM, Gilles <[hidden email]> wrote:
>> On Wed, 08 Jul 2015 12:22:03 +0000, James Carman wrote:
>>> Try merging first
>>> On Wed, Jul 8, 2015 at 7:27 AM Gilles <[hidden email]>
>>> wrote:
>>
>> Hmm.  What I need is a recipe from step _zero_:
>>
>> $ git remote -v show
>> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (fetch)
>> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (push)
>>
>> [I.e. where is the other branch, what to copy, what not to try (e.g. the
>> whole source hierarchy is different "math3" vs "math4"), etc.]
>>
>> Thanks,
>> Gilles
>>
>>
>>>> Hi.
>>>>
>>>> What is the easiest/fastest/safest way to backport changes to
>>>> the 3.x branch?
>>>>
>>>> Wouldn't it be a good idea to add some info about what other
>>>> branches exist into the "doc" directory (together with the
>>>> answer to the above question)?
>>>>
>>>>
>>>> Thanks,
>>>> Gilles
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [Math] Git misc (backport)

James Carman
Git can merge through file moves too.
On Wed, Jul 8, 2015 at 12:28 PM Phil Steitz <[hidden email]> wrote:

> On 7/8/15 9:00 AM, James Ring wrote:
> > You should be able to see all the branches with git branch -a. You can
> > check them out to work on them, e.g. git checkout -b MATH_3_X
> > remotes/origin/MATH_3_X
> >
> > How do you want to backport? Are you looking to cherry-pick individual
> > changes from the master branch back into 3_X? After you've checked out
> > 3_X, you'd cherry-pick the desired changes (git cherry-pick <commit>),
> > fix merge conflicts, then push your changes (either back to the remote
> > or to your own fork of the project, when you would then create a pull
> > request for review).
>
> See earlier discussion on this list.  You can't cherry-pick or
> automatically merge anything because of the package name change.
> What I do is just manually edit the package names in the diffs and
> re-apply.
>
> +1 to doc a simple process to adjust patches for backporting /
> forward-porting.
>
> Phil
> >
> > On Wed, Jul 8, 2015 at 5:54 AM, Gilles <[hidden email]>
> wrote:
> >> On Wed, 08 Jul 2015 12:22:03 +0000, James Carman wrote:
> >>> Try merging first
> >>> On Wed, Jul 8, 2015 at 7:27 AM Gilles <[hidden email]>
> >>> wrote:
> >>
> >> Hmm.  What I need is a recipe from step _zero_:
> >>
> >> $ git remote -v show
> >> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git
> (fetch)
> >> origin  https://git-wip-us.apache.org/repos/asf/commons-math.git (push)
> >>
> >> [I.e. where is the other branch, what to copy, what not to try (e.g. the
> >> whole source hierarchy is different "math3" vs "math4"), etc.]
> >>
> >> Thanks,
> >> Gilles
> >>
> >>
> >>>> Hi.
> >>>>
> >>>> What is the easiest/fastest/safest way to backport changes to
> >>>> the 3.x branch?
> >>>>
> >>>> Wouldn't it be a good idea to add some info about what other
> >>>> branches exist into the "doc" directory (together with the
> >>>> answer to the above question)?
> >>>>
> >>>>
> >>>> Thanks,
> >>>> Gilles
> >>
> >>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: [hidden email]
> >> For additional commands, e-mail: [hidden email]
> >>
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [hidden email]
> > For additional commands, e-mail: [hidden email]
> >
> >
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>