dev:meetings:2011-04-30
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| dev:meetings:2011-04-30 [2011/05/02 16:18] – formatting changes and a couple updates gmcharlton | dev:meetings:2011-04-30 [2022/02/10 13:34] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 6: | Line 6: | ||
| * If git complains about a non-fast-forward update, DO NOT FORCE A PUSH! | * If git complains about a non-fast-forward update, DO NOT FORCE A PUSH! | ||
| - | * **ACTION**: Prevent non-fast-forward updates on main topic branches (branches that have been shared with the world) | + | * **ACTION**: Prevent non-fast-forward updates on main topic branches (branches that have been shared with the world) (**DONE**) |
| * **ACTION**: Adopt naming convention for branches that should not be pulled from | * **ACTION**: Adopt naming convention for branches that should not be pulled from | ||
| * For example, '' | * For example, '' | ||
| Line 20: | Line 20: | ||
| * In the new regime, a committer would be someone who has the ability to push to master branch and create tags | * In the new regime, a committer would be someone who has the ability to push to master branch and create tags | ||
| * Possible to give multiple people the ability to push into a single branch (eg. collaborative topic branch like MARC-must-die, | * Possible to give multiple people the ability to push into a single branch (eg. collaborative topic branch like MARC-must-die, | ||
| - | * **ACTION**: Galen will manage the git server (at least to begin with). | + | * **ACTION**: Galen will manage the git server (at least to begin with). |
| - | * **ACTION**: Invite tsbere to join Galen in administering gitolite **UPDATE** tsbere invited and has accepted. | + | * **ACTION**: Invite tsbere to join Galen in administering gitolite **UPDATE** tsbere invited and has accepted. |
| - | * **ACTION**: ILS-Contrib needs to move to central repository (as an ILS-contrib tree) | + | * **ACTION**: ILS-Contrib needs to move to central repository (as an ILS-contrib tree) **UPDATE 2011-05-14 start with website, which is being set up as a separate repo** |
| ===== Workflow - squashing vs. maintaining all the ugly ===== | ===== Workflow - squashing vs. maintaining all the ugly ===== | ||
| Line 43: | Line 43: | ||
| * If the patch is 90% good, but needs fixes; commit the patch as-is and commit a follow-up patch to clean it up (this avoids merge conflicts when the patch contributor pulls from master subsequently) | * If the patch is 90% good, but needs fixes; commit the patch as-is and commit a follow-up patch to clean it up (this avoids merge conflicts when the patch contributor pulls from master subsequently) | ||
| * Patch wrangler? | * Patch wrangler? | ||
| - | * **ACTION**: Follow-up with Chris Sharp on git.evergreen-ils.org server. | + | * **ACTION**: Follow-up with Chris Sharp on git.evergreen-ils.org server. |
| ===== Rough plan ===== | ===== Rough plan ===== | ||
| - | - git-svn clone to seed the master repository (OpenSRF and ILS at the same time) | + | |
| - | * Bring tags along - but only for SVN tags, not one per revision ('' | + | * Bring tags along - but only for SVN tags, not one per revision ('' |
| - | - Gather committers' | + | - Gather committers' |
| - | - Test repository (go or no go) | + | - Test repository (go or no go) |
| - | - Pick a weekend for cutting over (at least a week after release: Galen suggests Saturday, May 14) | + | - Pick a weekend for cutting over (at least a week after release: Galen suggests Saturday, May 14) |
| ===== Things that need to be done: ===== | ===== Things that need to be done: ===== | ||
| - | * Modify Web site references to SVN | + | |
| - | * Contributing document (update references, git-format-patch) | + | * Contributing document (update references, git-format-patch) |
| - | * Policies for being added to the repo server | + | * Policies for being added to the repo server |
| - | * Suggested naming conventions | + | * Suggested naming conventions |
| - | * Statement on Evergreen interpretation of Signed-off-by | + | * Statement on Evergreen interpretation of Signed-off-by |
| - | * Wiki references to SVN | + | * Wiki references to SVN **UPDATE 2011-05-14: major references updated; still a number of minor references to clean up** |
| - | * Check codebase for SVN references (such as staff client installer auto build ID) | + | * Check codebase for SVN references (such as staff client installer auto build ID) **UPDATE 2011-05-14; direct references removed; phasefx and tsbere looking at the build ID issue** |
| - | * DIG manual references | + | * DIG manual references |
| - | * Blog post / mailing list | + | * Blog post / mailing list **DONE** |
| - | * Make SVN Trac page say " | + | * Make SVN Trac page say " |
| - | * Teach continuous integration server about git | + | * Teach continuous integration server about git **DONE** |
| - | * Freshmeat / Ohloh / Launchpad | + | * Freshmeat |
| - | * (Per comment by Jeff Godin on 2011-05-02) set up master to send updates to Evergreen commits mailing list. | + | * (Per comment by Jeff Godin on 2011-05-02) set up master to send updates to Evergreen commits mailing list. **DONE tsbere++** |
dev/meetings/2011-04-30.1304367519.txt.gz · Last modified: 2022/02/10 13:34 (external edit)