[boost] [githelp] Moving from push to pull requests

[Fletcher, John P]

I have been working for some time on boost phoenix using

git push origin develop

to push my changes. I have now been asked to change to use pull requests and I am not clear about how to get into the new setup.

My current setup on my local computer has phoenix as a subproject in a complete boost clone with branches develop, master and several other branches. I have not created any branches on the remote repository.

What I want is to have a repository where I can work and then send pull requests for things to go to the main develop.

I have two ideas about how this could be done.

(1) create a separate repository outside the modular structure and put a copy of phoenix there. I have created an empty structure called phoenix_changes both on my local computer and under my user name on github. I am puzzled as to how to get the correct content into it. This could come from my local copy or from the main repository.

(2) Should I instead create a new branch in both my local and the remote copies of boost/phoenix? If so how do I do that? Can I branch from the current develop as the starting point?

In either case I want to be able to send pull requests to the other developers. It would be helpful to have an example of the commands needed.

Please ask me for more information if this is not clear.

Thank you for the [githelp] resource.

John

_______________________________________________
Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost

[Jessica Hamilton]

On 30 April 2015 at 09:42, Fletcher, John P <j.p.fl...@aston.ac.uk> wrote:
> I have been working for some time on boost phoenix using
>
> git push origin develop
>
> to push my changes. I have now been asked to change to use pull requests and I am not clear about how to get into the new setup.

You should push to a feature branch, and then create a PR from your
feature branch to develop.

I also find https://hub.github.com/ very helpful for doing PRs from
the command line.

[Fletcher, John P]

________________________________________
From: Boost [boost-...@lists.boost.org] on behalf of Jessica Hamilton [jessica.l...@gmail.com]
Sent: 29 April 2015 22:46
To: bo...@lists.boost.org
Subject: Re: [boost] [githelp] Moving from push to pull requests

> On 30 April 2015 at 09:42, Fletcher, John P <j.p.fl...@aston.ac.uk> wrote:
> > I have been working for some time on boost phoenix using
> >
> > git push origin develop
> >
> > to push my changes. I have now been asked to change to use pull requests and I am not clear about how to > >get into the new setup.

> You should push to a feature branch, and then create a PR from your
> feature branch to develop.

It looks easier than I thought. In the main version I can do

git checkout -b feature/whatever develop

I can make changes in feature/whatever and then push it to the repository:

git push origin feature/whatever

(which makes a new branch there) and then do a pull request. Have I sorted that out correctly?

I have tried it out on my separate repository and it seems to work there.

Thank you for your help.

[Michael Caisse]

Hi Jon -

I recommend forking the phoenix repository and working from there. It is
easy enough to switch the phoenix submodule over to your fork/branch.

Simply use:

git checkout -b my_new_branch_name

to work on some new issue or feature. You can then push that branch to
the remote (github) and issue a PR to the main repositories development
branch.

This will keep things all nice. Generally speaking, we (Joel an I)
prefer PR's that contain all the commit history and having been smashed
into a single commit for the feature/bug fix.

We (Ciere) run an internal set of testers for Spirit and Fusion that
also auto-merge with development to check results. I'll add Phoenix and
your fork to the test infrastructure if you go that route.

As a general guideline for branching methodology, I would recommend
taking a look at this:
<http://nvie.com/posts/a-successful-git-branching-model/>

hth -
michael

--
Michael Caisse
ciere consulting
ciere.com

[Edward Diener]

On 4/29/2015 5:42 PM, Fletcher, John P wrote:
> I have been working for some time on boost phoenix using
>
> git push origin develop
>
> to push my changes. I have now been asked to change to use pull requests and I am not clear about how to get into the new setup.

If you are an administrator for a library there is no need to create
pull requests for changes to that library, unless you want to see if
anybody else wants to make comments about your changes.

[Joel de Guzman]

On 4/30/15 6:32 AM, Edward Diener wrote:
> On 4/29/2015 5:42 PM, Fletcher, John P wrote:
>> I have been working for some time on boost phoenix using
>>
>> git push origin develop
>>
>> to push my changes. I have now been asked to change to use pull requests and I am not
>> clear about how to get into the new setup.
>
> If you are an administrator for a library there is no need to create pull requests for
> changes to that library, unless you want to see if anybody else wants to make comments
> about your changes.

Edward, I am still the administrator for Phoenix. There are a few maintainers
for the libraries, for which I am the main author and administrator, and what
works for me best is for all maintainers to issue pull requests for review.

Regards,
--
Joel de Guzman
http://www.ciere.com
http://boost-spirit.com
http://www.cycfi.com/

[Edward Diener]

On 4/29/2015 8:13 PM, Joel de Guzman wrote:
> On 4/30/15 6:32 AM, Edward Diener wrote:
>> On 4/29/2015 5:42 PM, Fletcher, John P wrote:
>>> I have been working for some time on boost phoenix using
>>>
>>> git push origin develop
>>>
>>> to push my changes. I have now been asked to change to use pull
>>> requests and I am not
>>> clear about how to get into the new setup.
>>
>> If you are an administrator for a library there is no need to create
>> pull requests for
>> changes to that library, unless you want to see if anybody else wants
>> to make comments
>> about your changes.
>
> Edward, I am still the administrator for Phoenix. There are a few
> maintainers
> for the libraries, for which I am the main author and administrator, and
> what
> works for me best is for all maintainers to issue pull requests for review.

That is totally understandable. It is your library and you can decide
how others update it.

I meant to say that the usual reason for pull requests when one already
has administrative rights is not only having others make comments but
also to have one's changes reviewed by others. What you have said backs
that up.

[Menelaos Karavelas]

Hi John.

This link might help and give you some ideas (this is how we do our work
in Boost.Geometry):
https://github.com/boostorg/geometry/wiki/Contribution-Tutorial

Best,

- m.