Version 4 (modified by Fran Boon, 13 years ago) ( diff )



Sahana Eden has decided to move from Bzr/LaunchPad to Git/GitHub


  • The current repository is huge & bloated, taking too long to download.
  • Even simple changes take an age to Pull down to servers
  • Web2py no longer supports Bzr/LaunchPad, so we want to be able to maintain a common tool to work with both repositories.
  • New developers are likely to be more familiar with Git/GitHub


The preferred approach is to have a clean repository, in order to get the maximum benefit from the migration...although it is technically possible to migrate the commit history. Commit History will instead be maintained on the LaunchPad site as an archive

Migrating Branches

Merge branch with trunk using normal Bzr tools


Developer Workflow

We suggest adopting the Story Branch pattern, which allows squashing commits in order to keep the main Trunk as clean as possible

cd <mybranch>
# Update your working directory with latest code from Trunk
git checkout master
git pull
git checkout -b <mystory>
git commit -am "My Story"
# Quick review of code (no test code left in, etc)
git diff master
# Merge latest Trunk
git checkout master
git pull
git checkout <mystory>
git rebase master
# Push to your branch on GitHub
git checkout master
git merge <mystory>
git push
# Cleanup
git branch -d <mystory>

Developer Configuration

git config --global "Your Name"
git config --global
git config --global github.user yourgithubusername
git config --global github.token yourtoken
git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
git config --global merge.tool diffmerge
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'C:/Program Files (x86)/Git/etc/wrappers/' "$LOCAL" "$REMOTE"
git config --global difftool.prompt false
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'C:/Program Files (x86)/Git/etc/wrappers/' "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$MERGED"
git config --global mergetool.prompt false
git config --global mergetool.trustExitCode false
git config --global mergetool.keepBackup false


Install Console & Diffmerge & configure Powershell.

Developer Tools

Pre-commit hook to update VERSION (& run tests?), e.g. based on


Attachments (2)

Download all attachments as: .zip

Note: See TracWiki for help on using the wiki.