Le 31/08/2017 à 00:06, Nicolai Hess a écrit : > Hi, > > I am now able to use iceberg on windows, thanks for the help. > > But I am still a bit unsure about how the review and contribution > workflow should work. > > up to pharo 6 I just load a latest image, > - load the slice from a fogbugz number and was able to review the change > - or create a slice and upload it to the inbox > > in pharo 7 > - what is the equivalent to "getting the latest image" (and being able > to load and review a fix), > up to pharo 6 I just > - load the latest image in pharolauncher (or from the command line). > - opened the inbox repository. > - load and review change/fix > - throw away this change (close image without save) > - reopen that image to move on with the next item to review. >
Hi, I'll not be of a great help here since I only reviewed PR via the github interface for now but I know that Guille wrote this guide: https://github.com/guillep/PharoIntegrationProcess/wiki/Pharo-Development-Process There is a review process discription. > But now, do I have to update my local branch for every new pull > request ? And how do I do this ? In other git project I would, I would > fetch upstream, checkout master, merge with upstream/master, push > the master to my fork origin > How should this be done with my pharo 7 fork ? (And do we only work > on the development brach instead of the master)? > > And do I this only in the command line or do I manage my fork (and > keep it up to date) from within pharo with iceberg ? > How do I actually access the pull requests from within pharo ? Maybe > I am stupid, but I just can not find it. > I would like do this steps, (as I was used to it from the prior > contribution process, by loading code from the inbox) > - Just look at the changes > - apply the changes > - throw away this changes, and move one with the next fix review > > And the same for creating a fix / pull request. Do I need to be up to > date with my own fork, or only the local copy of the pharo repository ? > Again, for pharo 6 I would just load a latest image, make my changes / > code fixes and create a slice. Save to the inbox -> done. > And looking at iceberg, I have really no clue how to upload a fix. > To create a fix you don't really need a fork totally up to date with the origin repository but it's recommended to sync once in a while to not create conflics if changes happen in the same part of the system that you'll change. The process is described here: https://github.com/guillep/PharoIntegrationProcess/wiki/Keep-your-repo-in-sync In general this will do the trick: $ git checkout development (if not already on development) $ git pull [PHARO_ORIGIN] development $ git push [FORK_ORIGIN] development > I see that other people are using the new process, and I feel a bit lost > and closed out of the pharo 7 development process, as I am at the moment > unable to understand how this work. > Are there any other resources I missed ? > > I use the new process but I already had some knowledge of git. I used it to manage team work at the university and I used it with smalltalk's projects and file tree. Also I asked a looot of questions to esteban/pavel/guille. The process need to be improved again and I still often have troubles. (I got one vm crash and two iceberg crash today while contributing for example). I try to report the maximum of my reproducible problem here: https://github.com/pharo-vcs/iceberg/issues If you see trouble with Iceberg it could be cool to give info to help to ease the contribution process. For your last question, the resources I use are mostly the wiki of Guille: https://github.com/guillep/PharoIntegrationProcess/wiki My knowledge of git and the help of people like esteban/guille/pavel/marcus… I hope some of those resources can help you. -- Cyril Ferlicot https://ferlicot.fr http://www.synectique.eu 2 rue Jacques Prévert 01, 59650 Villeneuve d'ascq France
signature.asc
Description: OpenPGP digital signature
