Home

slimjim777 edited this page Feb 12, 2015 · 1 revision
Clone this wiki locally
Clone in Desktop

Installation

sudo apt-get install --yes bzr git bzr-fastimport git-flow
sudo wget https://raw.github.com/zyga/git-lp/master/git-lp -O /usr/local/bin/git-lp
sudo chmod +x /usr/local/bin/git-lp
wget https://raw.github.com/zyga/git-lp/master/bzr.patch -O - | sudo patch -p0 -d /usr/share/pyshared

Start working on a project

git lp init --fetch lp:checkbox
cd checkbox
git lp branch some-feature
# now on special
# launchpad/some-feature branch
# hack / commit hack / commit / hack
git lp push

Code review spots an issue

# code review spotted something
# hack hack hack
# commit? maybe rebase -i and squash
# rebase interactively!
# keep the flow of changes logic
git lp rebase -i
# push back to launchpad
# pass --overwrite, we rewrote history
git lp push --overwrite

Feature landed, cleanup

# someone / something lands branches
# we just pull the fresh trunk
# and update our +upstream branch
git lp fetch
# drop the local feature branch
git branch -D launchpad/some-feature
# drop the unused bzr branches
# and marks files
git lp gc --remove

You’ve just submitted feature1 for code review, start work on feature 2

?