+ Follow

Migrating to Git: Rethinking the Commit

by Kim Moir

2,304 views

Migrating to Git: Rethinking the Commit
EclipseCon Europe, November 3, 2011

Accessibility

View text version

Upload Details

Uploaded via SlideShare as OpenOffice

Usage Rights

File a copyright complaint

35 Embeds 1,319

http://relengofthenerds.blogspot.com	790
http://relengofthenerds.blogspot.ca	257
http://relengofthenerds.blogspot.de	69
http://relengofthenerds.blogspot.in	39
http://relengofthenerds.blogspot.fr	27
http://relengofthenerds.blogspot.com.au	22
http://relengofthenerds.blogspot.co.uk	21
http://relengofthenerds.blogspot.nl	8
http://relengofthenerds.blogspot.ch	7
http://relengofthenerds.blogspot.se	7
http://www.relengofthenerds.blogspot.com	7
http://relengofthenerds.blogspot.it	7
http://relengofthenerds.blogspot.kr	5
http://relengofthenerds.blogspot.tw	5
http://relengofthenerds.blogspot.co.at	5
http://relengofthenerds.blogspot.gr	4
http://relengofthenerds.blogspot.no	4
http://relengofthenerds.blogspot.dk	3
http://relengofthenerds.blogspot.mx	3
http://relengofthenerds.blogspot.fi	3
http://relengofthenerds.blogspot.com.br	3
http://relengofthenerds.blogspot.be	3
http://relengofthenerds.blogspot.co.nz	3
http://relengofthenerds.blogspot.jp	2
http://relengofthenerds.blogspot.co.il	2
http://relengofthenerds.blogspot.hu	2
http://relengofthenerds.blogspot.com.ar	2
http://relengofthenerds.blogspot.ru	2
http://relengofthenerds.blogspot.com.es	1
http://relengofthenerds.blogspot.pt	1
http://www.relengofthenerds.blogspot.ca	1
http://relengofthenerds.blogspot.sg	1
http://relengofthenerds.blogspot.ro	1
http://relengofthenerds.blogspot.cz	1
http://relengofthenerds.blogspot.ie	1

More...

Statistics

Likes: 2
Downloads: 8
Comments: 0
Embed Views: 1,319
Views on SlideShare: 985
Total Views: 2,304

Migrating to Git: Rethinking the Commit Presentation Transcript

@Kim_Moir IBM Ottawa

Migrating to Git: Rethinking the Commit

Git Happens

@Kim_Moir IBM Ottawa

About Us

10 year old code repository
Around 40 active committers
Produce approximately 600 bundles a build
Limited Git experience before migration

Active development streams: 4.2, 4.1.x, 3.8, 3.7.x

Unix group (guid) -> Git repo 2 CVS repos -> ~25 Git repos

CVS:

Condition
Copy to temporary location
Run cvs2git

git fast-import CVS content into temporary Git repository
git-move-refs
git prune, repack, gc and repack
Run a script to remove delete only tags

Add gitignore file via git filter-branch
Clone into bare repo
git prune, repack, gc and repack
copy repo into final location

“ It’s one thing to migrate to Git, it’s another thing to use it” -Olivier Thomann

“ Git: The command line is where it’s at” -Bogdan Gheorge

“ Patches are like dumping a database into a text file. You need to think in terms of releasing fixes to branches instead of passing around patches. Patches also lose some Git provenance information such as author and parent. ” -John Arthorne

“ That operation is four pay-grade levels above my current git-foo .” -Paul Webster

“ I have broken the platform-ui git repository. ” -Bug 361707

“ Better policy to guard against deleting all branches and tags from our public repos” -Bug 362076

“ There are three categories of costs that we incurred during the Git migration: The migration process itself, the developer learning curve and dealing with EGit issues ” -Mike Wilson

Read
Test migration
Communicate

“ The complexity of our code is the barrier to contribution, not the SCM ”. -Paul Webster

Questions?

“ Git happens ” -Kim Moir

Useful links

Managing large binary files with Git http://stackoverflow.com/questions/540535/managing-large-binary-files-with-git
Git workflows for CVS users http://wiki.eclipse.org/Platform-releng/Git_Workflows

[email_address] mailing list

EGit Documentation http://eclipse.org/egit/documentation/
Git parable http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Pro Git Book http://progit.org /
Think like a git http://think-like-a-git.net /
Migration scripts we used git://git.eclipse.org/e4/org.eclipse.migration.git
Git flow discussion http://dev.eclipse.org/mhonarc/lists/eclipse-dev/msg09229.html

Image credits

Beach http://www.flickr.com/photos/archer10/2218592521/sizes/
Reading room in British Museum http://www.flickr.com/photos/cliveabrown/2258478542/
Blackbirds at dusk http://www.flickr.com/photos/moonjazz/1216783552/
Binary bridge at Georgia Tech http://www.flickr.com/photos/mcclanahoochie/5068845349/sizes/l/in/photostream/
Branches http://www.flickr.com/photos/e_phots/3012896283/
Git stash http://www.flickr.com/photos/dealingwith/4295488113/
Fork you http://www.flickr.com/photos/sunfox/4365495446/sizes/l/in/photostream/
Rethink http://www.flickr.com/photos/venegas/5549123/
Gears http://www.flickr.com/photos/wwarby/4782904694
Git gas station http://www.flickr.com/photos/soo/6047596987/
Advice http://www.flickr.com/photos/wurzle/659315/
Fraser river delta http://www.flickr.com/photos/ecstaticist/3055718118/
Women with laptops at Pop Life http://www.flickr.com/photos/yourdon/5157431891/in/photostream/

Legal notice

Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
Eclipse and the Eclipse logo are trademarks of Eclipse Foundation, Inc.
IBM and the IBM logo are trademarks or registered trademarks of IBM Corporation, in the United States, other countries or both.
Other company, product, or service names may be trademarks or service marks of others.
THE INFORMATION DISCUSSED IN THIS PRESENTATION IS PROVIDED FOR INFORMATIONAL PURPOSES ONLY. WHILE EFFORTS WERE MADE TO VERIFY THE COMPLETENESS AND ACCURACY OF THE INFORMATION, IT IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND IBM SHALL NOT BE RESPONSIBLE FOR ANY DAMAGES ARISING OUT OF THE USE OF, OR OTHERWISE RELATED TO, SUCH INFORMATION. ANY INFORMATION CONCERNING IBM'S PRODUCT PLANS OR STRATEGY IS SUBJECT TO CHANGE BY IBM WITHOUT NOTICE

Migrating to Git: Rethinking the Commit

by Kim Moir

Accessibility

Categories

Upload Details

Usage Rights

35 Embeds 1,319

Statistics

Migrating to Git: Rethinking the Commit Presentation Transcript