BLUG 2012 Version Control for Notes Developers

Version Control forNotes developers Martin Jinoch

#shameless-plug blog: http://jinoch.cz twitter: @mjinoch email: martin@jinoch.cz

AgendaWhat is version control and why you shoulduse it, ...Development work-flow with Git and git-flowHow to use Git in DesignerOther tools you can integrate into yourdevelopment process

“Classic” way ;-)

“Classic” wayno easy way to get back to previous stateunless we are keeping→ backup versions of design elements→ or backup copies of the whole templatewe dont know what the last change was→ we should maintain a separate change-log

There must be a better wayVersion control systems→ client/serverCVS, SVN (Subversion), ...→ distributedGit, Bazaar, Mercurial, ...Which one to use? Any. But please, DO usethem. (And dont use CVS)http://gitvsmercurial.com

Basic operationscommit → save current state to VCSdiff → show the differences between commits (versions)revert → undo (any) commit.branch → make a new “copy” of the whole appmerge → apply changes from one branch to another branch

Branching modelhttp://nvie.com/posts/a-successful-git-branching-model/git-flowby Vincent Driesen (http://nvie.com)covers not only development process- like creating new featuresbut also release management and support- promoting new features to production app, fixing bugsin production app and in development version at oncecould be used with other VCSas well!

pretty simple, huh!?lets see a demo

git-flow to Notes mappingmaster = NTF file on production serverdevelop = NTF file on test serverfeature/* = NTF file on local machine or localserverteam settings: rights to push to master and/ordevelop should be restricted to role(“gatekeeper”). In general individualdevelopers work on feature branches andsend pull requests to “gatekeeper”

Support for Version control in Designerin 8.5.3 it is built-in to Designerconnects NTF with so called on-disk projectsyncs changes to on-disk project and back→ version control systems need real files toact on not virtual file system→ and some design elements have to beconverted to DXL

Configuring DDE for version controlDesigner runs on top of Eclipse 3.4 (2008)install VCS plugin from OpenNTF.org→ EGit for Domino Designer (by Nathan T. Freeman) based on current EGit for Eclipse 3.6 and higher→ Subversion UpdateSite for Domino DesignerMercurial - http://cbes.javaforge.com/update andchoose 1.6.0 version of MercurialEclipse plugin and1.4.3 version of Mercurial Binaries

Install EGit to DDE

Install EGit to DDE and point it to the downloaded zip file

Install EGit to DDE just check and press Next

Install EGit to DDE I guess even as non-lawyers we can accept this

Install EGit to DDE after pressing Finish keep accepting (there is one more dialog asking for permission to install plugin) and then restart Designer

Enable Source Control for NSF

Set up Git for the on-disk project

Start using Git directly from DDE or use command line in Git Bash (were developers, right?)

Redmine● project management tool, bug tracker, ...● connects to repository to link commits to issues (commit message “fixes #1” automatically closes issue with id 1) and for time tracking (@1h30m)● will probably be used for projects on OpenNTF.org as well as Git and Mercurial repositories

Questions?● more about Git http://think-like-a-git.net great book http://progit.org

Resources● Subversion - http://subversion.apache.org/● Git – http://git-scm.com/, Git for Windows - http://code.google.com/p/msysgit/ and follow link “Git for Windows”● Mercurial – http://mercurial.selenic.com/● Bazaar – http://bazaar.canonical.com/● EGit for Domino Designer – http://www.openntf.org/internal/home.nsf/project.xsp? action=openDocument&name=EGit%20for%20IBM%20Domino %20Designer● Subversion UpdateSite for Domino Designer – http://www.openntf.org/internal/home.nsf/project.xsp? action=openDocument&name=Subversion%20UpdateSite%20for %20Domino%20Designer● branching model - http://nvie.com/posts/a-successful-git-branching-model/● git-flow – https://github.com/nvie/gitflow● Redmine – http://www.redmine.org

Thank you!

http://jinoch.cz	183
http://jinoch.l	5
http://www.jinoch.cz	4

BLUG 2012 Version Control for Notes Developers

by Martin Jinoch on Mar 26, 2012

Accessibility

Categories

Upload Details

Usage Rights

3 Embeds 192

Statistics

BLUG 2012 Version Control for Notes Developers Presentation Transcript