User Tools

Site Tools


dev:meetings:2011-04-30

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
dev:meetings:2011-04-30 [2011/05/02 16:18] – formatting changes and a couple updates gmcharltondev: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, ''wip/foobar'' = work in progress = pull at your own risk     * For example, ''wip/foobar'' = work in progress = pull at your own risk
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, QA staging branch)   * Possible to give multiple people the ability to push into a single branch (eg. collaborative topic branch like MARC-must-die, QA staging branch)
-  * **ACTION**: Galen will manage the git server (at least to begin with). +  * **ACTION**: Galen will manage the git server (at least to begin with). **DONE** 
-  * **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.  **DONE, tsbere is active** 
-  * **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.  **UPDATE 2011-05-02** Request sent to Chris Sharp; awaiting date for when GPLS IT can create the VM.+  * **ACTION**: Follow-up with Chris Sharp on git.evergreen-ils.org server.  **UPDATE 2011-05-02** Request sent to Chris Sharp; awaiting date for when GPLS IT can create the VM. **DONE**
  
 ===== Rough plan ===== ===== Rough plan =====
  
-- git-svn clone to seed the master repository (OpenSRF and ILS at the same time) +  - 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 (''git-svn'' applies a git-svn-id with the revision number) +    * Bring tags along - but only for SVN tags, not one per revision (''git-svn'' applies a git-svn-id with the revision number) **DONE** 
-- Gather committers' public keys +  - Gather committers' public keys **UPDATE 2011-05-14: underway; some committers are either on vacation or are apparently inactive** 
-- 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)  **DONE for Evergreen and OpenSRF**
  
 ===== Things that need to be done: ===== ===== Things that need to be done: =====
  
-* Modify Web site references to SVN +  * Modify Web site references to SVN 
-  * Contributing document (update references, git-format-patch) +    * Contributing document (update references, git-format-patch) **UPDATE 2011-05-14: well under way** 
-  * Policies for being added to the repo server +    * Policies for being added to the repo server 
-  * Suggested naming conventions +    * Suggested naming conventions **UPDATE 2011-05-14: underway, see #evergreen logs** 
-  * Statement on Evergreen interpretation of Signed-off-by +    * Statement on Evergreen interpretation of Signed-off-by **DONE** 
-* 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 "read-only" for each gitted repository +  * Make SVN Trac page say "read-only" for each gitted repository **DONE** 
-* Teach continuous integration server about git +  * Teach continuous integration server about git **DONE** 
-* Freshmeat / Ohloh / Launchpad +  * Freshmeat **DONE** / Ohloh **DONE** / Launchpad **master branch replaced SVN trunk, but seems to be a limit of a single branch that can be tracked? Also, need to retarget all "trunk" issues to "master"?** 
-* (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)

Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
CC Attribution-Share Alike 4.0 International Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki

© 2008-2022 GPLS and others. Evergreen is open source software, freely licensed under GNU GPLv2 or later.
The Evergreen Project is a U.S. 501(c)3 non-profit organization.