pull requests
Moderators: FourthWorld, heatherlaine, Klaus, kevinmiller, LCMark
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
pull requests
Is it still necessary to issue pull requests off master?
So I forked the repository on github.
I cloned the fork onto my computer.
I made a branch off master and checked it out.
I made my changes on my branch.
I checked out the master branch and pulled the latest changes from the 6.0.1 branch.
Should I now merge my changes back onto master before pushing and issuing a pull request?
Or can I push my changes on my branch and issue a pull request?
It seems like a bad idea to merge my changes while the 6.0.1 branch is still in flux in the livecode repository and haven't been merged into master there.
I think it would be good to have the procedure for issuing pull requests laid out simply so that contributors don't have confusion about how to go about things.
So I forked the repository on github.
I cloned the fork onto my computer.
I made a branch off master and checked it out.
I made my changes on my branch.
I checked out the master branch and pulled the latest changes from the 6.0.1 branch.
Should I now merge my changes back onto master before pushing and issuing a pull request?
Or can I push my changes on my branch and issue a pull request?
It seems like a bad idea to merge my changes while the 6.0.1 branch is still in flux in the livecode repository and haven't been merged into master there.
I think it would be good to have the procedure for issuing pull requests laid out simply so that contributors don't have confusion about how to go about things.
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
Re: pull requests
I think so. Mark won't want to merge anything but bugfixes into a release branch.Is it still necessary to issue pull requests off master?
Yeah... this is the trouble because Marks changes to 6.0.1 config enabled me to compile with 10.6 and so I branched off release to to resolveImage but then I knew he would want the pull request to branch of master head so I ended up copying my change, branching master head, pasting the change and then deleting the branch off release... I think once there's a develop branch in there that has changes merged off release onto it then things will be much simpler. Most of our stuff can then branch of develop.So I forked the repository on github.
I cloned the fork onto my computer.
I made a branch off master and checked it out.
I made my changes on my branch.
I checked out the master branch and pulled the latest changes from the 6.0.1 branch.
Won't your branch then include a merge of release onto master before it's ready for release? I think it would and that's not what Mark will want because master should only be merged with release when it's actually released...Should I now merge my changes back onto master before pushing and issuing a pull request?
You should push your branch and issue a pull request of it to master or develop (when it exists) but because you've merged release it complicates things... Not sure if you can rebase on master from there... I tried that and it rebased release so I had to reset --hard.. you might be able to checkout master and cherry pick??? starting to get into the mysteries of git though...Or can I push my changes on my branch and issue a pull request?
I think the docs on the contributor page will eventually be clarified to cover this clearly.It seems like a bad idea to merge my changes while the 6.0.1 branch is still in flux in the livecode repository and haven't been merged into master there.
I think it would be good to have the procedure for issuing pull requests laid out simply so that contributors don't have confusion about how to go about things.
LiveCode User Group on Facebook : http://FaceBook.com/groups/LiveCodeUsers/
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
Re: pull requests
I merged the 6.0.1 branch onto my master branch, not onto my dev branch. My changes are still pristine.You should push your branch and issue a pull request of it to master or develop (when it exists) but because you've merged release it complicates things...
Grrr. So I'm going to have to do a git reset --hard "6.0.0" on my master branch to undo the 6.0.1 pull, create a "release" branch, stage the 6.0.1 changes there instead of onto master, then merge my changes on my dev branch onto my master branch in order to issue a pull request.Not sure if you can rebase on master from there... I tried that and it rebased release so I had to reset --hard.. you might be able to checkout master and cherry pick??? starting to get into the mysteries of git though...
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
Re: pull requests
It's all getting a little confusing but if you branched your dev branch of release-6.0.1 then merging that into master will bring those changes over. If you wait until RunRev have merged release-6.0.1 with master then it doesn't matter because it's all in the same timeline. Hopefully once 6.0.1 is out Mark will create a dev branch off it which will be regularly updated with anything critical from release branches.Grrr. So I'm going to have to do a git reset --hard "6.0.0" on my master branch to undo the 6.0.1 pull, create a "release" branch, stage the 6.0.1 changes there instead of onto master, then merge my changes on my dev branch onto my master branch in order to issue a pull request.
Also, don't merge to master to issue the pull request. Push your feature or bug fix branch to your fork on github then issue a pull request from that branch to the appropriate branch on runrev/livecode. For most things apart from regression fixes it should be develop (which doesn't exist). If you merge to master and they don't accept it then it makes your life hard because your master branch now can't cleanly pull theirs.
LiveCode User Group on Facebook : http://FaceBook.com/groups/LiveCodeUsers/
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
Re: pull requests
Great. Thanks - that's why I was asking. I was under the assumption that I'd have to merge to master before pushing because that's the way they wanted the pull requests. Not doing that keeps things *much* cleaner.Also, don't merge to master to issue the pull request.
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
Re: pull requests
If you look at open pull requests they are all on their own branch: https://github.com/runrev/livecode/pulls
When (I'm assuming Mark) integrates them then I'd guess that they will decide for themselves which branch they want to merge them into given the change.
When (I'm assuming Mark) integrates them then I'd guess that they will decide for themselves which branch they want to merge them into given the change.
LiveCode User Group on Facebook : http://FaceBook.com/groups/LiveCodeUsers/
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
Re: pull requests
I'm not too concerned about how they're handled at the project management end, I just want to make sure that I'm set up properly at the contributor end so that I don't end up rebranching and rebasing and who-knows-what-all-else in order to backtrack.
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
Re: pull requests
right, in that case just always work on a branch named with the feature/bugfix you are implementing, push that to your fork then send a pull request from that. You can then always pull their branches from runrev/livecode without any trouble and rebase or merge your feature with the head of develop if they are taking a while to implement and you want the latest features...
LiveCode User Group on Facebook : http://FaceBook.com/groups/LiveCodeUsers/
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
Re: pull requests
Good. That sounds straightforward.
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
Re: pull requests
yep, that's why I like git-flow. It's also a well documented branching workflow and there's scripts and support in GUI tools like SourceTree for it. It would be well worth just following it to the letter rather than coming up with a variant I think.
LiveCode User Group on Facebook : http://FaceBook.com/groups/LiveCodeUsers/
Re: pull requests
Basically, as Monte says, work in a branch off of master, or in the future if you are working on a feature (or bugfix) which is 'for the future' (i.e. beyond the current dev cycle for the next major version) branch off of development and track.
The issues at the moment sound like they are more to do with the teething issues with the build scripts rather than anything else - these will drop away when 6.0.1 gets merged into master - which we're hoping for in a few days.
The issues at the moment sound like they are more to do with the teething issues with the build scripts rather than anything else - these will drop away when 6.0.1 gets merged into master - which we're hoping for in a few days.
Re: pull requests
I should point out that the docs we have posted so far (i.e. the getting involved document) do need some significant revisions. We'll be doing those over the course of the next week - now that the project is out and there are people getting involved we can see better how to structure and organise things.
-
- VIP Livecode Opensource Backer
- Posts: 3581
- Joined: Mon Jan 22, 2007 7:36 am
- Location: Berkeley, CA, US
- Contact:
Re: pull requests
Yeah, I posted revised "getting started" updates to the dev-list yesterday.
PowerDebug http://powerdebug.ahsoftware.net
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev
PowerTools http://www.ahsoftware.net/PowerTools/PowerTools.irev