2011-01-11 Tuesday Meeting
Attending: Melissa, Brian, Josh, Jean-Marie, Ola, Donald, Will, Scott, Andrew, Curtis, Carlos
Agenda
Remember: Agenda must be complete (with estimated times) on the day before the meeting. Any additions after that must go at the bottom (AOCB)
Accepting minutes from last meeting
Matters Arising (<10 mins)
- Andrew: create tickets for ome-xml downgrading & binary-only ome-xml, CC Jason
- Jason: contact vendors about what use cases are most important for downgrading XML schemes (with story numbers)
- Josh: send out an email on testing git
- Plan meeting for Ice 3.4 discussion
- Will : Create story for ASCB feedback for next year
- Jean-Marie: Check/update FAQ page entry on Java 1.6 instability
- Hudson
Using GIT for source control: Josh's presentation (30 mins)
- Please review Josh's Videos/Links BEFORE meeting see Josh's Git Page and nitpick emails for links
-
A) To figure out where we are...
- How many looked at the movies? Understandable?
- How many read any of the pages? Any particularly good?
- How many tried cloning my repository? Any problems?
-
B) To hear what everyone thinks...
- Who saw something they liked?
- Who has questions or specific topics which need to be discussed?
- Who has reservations? (Windows, Community, Loss of dev time, Too complex, etc.)
- Who needs more information before we move forward?
-
C) To find out our timeline...
- How (and by when) do we decide if we are moving?
- How (and by when) do we decide when we are moving?
- When do we contact the lists? How long do they need to have?
- Do we turn off svn and test first? When?
-
D) To define how we work...
- See http://users.openmicroscopy.org.uk/~jmoore/git/workfows.html
- Do we allow/encourage/force use of github? gitweb? (i.e. how do we share with other developers?)
- Do we have one central repository? Handle merges yourself.
- Do we have an integration manager who handles merges?
- Does something like "dictator & lieutenants" make sense (perhaps later)?
- Do we use git-flow? Something more or less strict? Build/extend our own?
- Do we need to buy any GUI tools?
- Do we mirror git to svn? (Added after meeting)
Any other business (<5 mins)
- Brian: Documentation spreadsheet reminder
- Andrew: Arrangement of desks in dundee office / New desk for Scott
- Scott: Presentation in Rome on 2nd February at the Conference on Design Principles and Practices .
In Attendance:
Melissa, Brian, Josh, Jean-Marie, Ola, Donald, Will, Scott, Andrew, Curtis, Carlos
Notes
Accepting minutes
- Yes
Matters Arising (<10 mins)
- Andrew: create tickets for ome-xml downgrading & binary-only ome-xml, CC Jason (DONE)
- Jason: contact vendors about what use cases are most important for downgrading XML schemes (with story numbers)
- Josh: send out an email on testing git (DONE)
-
Plan meeting for Ice 3.4 discussion (PENDING - mostly Mac issues?, maybe should hold off on this for now)
- Support 3.4 or 3.3/3.4
- There has been some requests for this from the Mac community
- If we move to this all devs have to upgrade to 3.4
- If we do a dual setup, that may require more work (haven't done this yet)
- Josh will review requests and report back on this
- May want to wait for this till after GIT changes
-
Will : Create story for ASCB feedback for next year (DONE - Haven't created a new story)
- Jean-Marie: Important to collect comments/requests from ASCB in one place
- Jean-Marie: Check/update FAQ page entry on Java 1.6 instability (DONE)
- Hudson (reorganizing build?) (DONE)
GIT
-
Movies:
- Ola: too much information. Used quick start.
- Will: rebase & stash reference for later.
- Largely yes's about
- Andrew: after third movie, git-flow seemed nice but actions just on my machine
-
Andrew: Is there a way we can let hudson do hourly 'updates' from devs (for backup purposes)
- Josh: Could be done, might want to setup local master builds to push to hudson when changed
- Josh: So for example: Every commit goes to backup server, official release go to hudson
- Josh: Have to find a balance between backing up and working offline
- Josh: We can have 'public repo', 'public dev repos', and 'private/local repos' if we want
-
Impressions
- Will: git-flow looked a bit simpler; torn between GUI or CLI
- Brian: like the overall concept (ProGit)
-
Curtis:
- best experience (cF. svn) is merging branches with really complicated directory structures
- when working on imglib/maven, merge just worked. just two conflicts
- bioformats example is horrible.
-
Carlos:
- biggest nightmare keeping a modified OMERO 4.1 working
- need to get changes in and merge them back.
- fear every time code is pushed
-
Any reservations?
-
Andrew: Where is everything stored?
- Josh: 1 GIT directory, everything db'd by SHA-1, no partial downloads of repo (you get it all)
- Josh: Head file is your current state
-
Andrew: Does GIT understand apple package directories?
- Josh: doesn't care about directories, but won't handle empty directories
- Josh: still might be a gotcha
-
Curtis: agilo/trac? Windows?
- Curtis: my experience is it works with small commits, but diffing large commits is painfully slow
- Josh: Has used GIT on windows.
- Curtis: There is a tortoiseGit (slower) for windows users. EGIT for subclipse is not great (yet)
-
Andrew: Where is everything stored?
-
How and When are we moving to GIT?
- Josh: Have to give the community a chance to voice their option / adjust
- Josh suggests: Let community know, try it internally and report problems, then move towards public release
- Josh: We could try a 'test week' and re-evaluate then. Josh can port things over from GIT to Subversion if needed.
-
We can discuss section 'D' of the GIT discussion after the test week.
- Curtis: Suggests we have one central repo to acclimate folks to the GIT concept
- Curtis: other cool thing is contributions. "contrib" branch for others to commit to.
-
Movies:
AOCB
-
Brian: Documentation spreadsheet reminder
- Shoola trac added, but not complete (perhaps sometime tomorrow)
- Jean-Marie: can we have tickets for these? Brian: Can do
-
Scott: Presentation in Rome on 2nd February at the Conference on Design Principles and Practices
- heads up that there is a talk
- interdisciplinary
- JMB: Materials needed?
- SL: generic materials perhaps.
- Andrew: Arrangement of desks in dundee office / New desk for Scott
-
Brian: Documentation spreadsheet reminder
Action Items
* Josh: Review community about Ice 3.4. Where do we stand?
* Josh: Write to ome-devel about git
* Everyone (Tuesday): Review C & D in one-week.
* Andrew: copy C & D over.
* Brian: produce tickets for people to review docs
* Scott: send link to conference.