[Pkg-crosswire-devel] BzrGuide

[Jonathan Marsden]

Daniel Glassey wrote:

> I don't have a clue where to start with bzr. Any chance you could make
> a quick BzrGuide like
> http://wiki.debian.org/Teams/DebianCrosswire/GitGuide?
> 
> Or point me towards existing docs to start with?

In order, read:

  (1) http://doc.bazaar-vcs.org/bzr.dev/en/mini-tutorial/index.html
  (2) https://wiki.ubuntu.com/BzrContributorHowto
  (3) https://wiki.ubuntu.com/BzrMaintainerHowto

# And here is a super-quick guide-by-example by me
# (The LaunchPad related stuff may be Ubuntu-specific?)

# Set up bzr so it knows you -- I do this in .bashrc
bzr whoami "$DEBFULLNAME <$DEBEMAIL>"
# Below sets launchpadlogin to jmarsden if debemail is jmarsden at whatever
bzr launchpadlogin ${DEBEMAIL%%@*}

# cd somewhere relevant and grab a copy to look at
mkdir -p ~/packages/sword
cd ~packages/sword
bzr branch lp:~pkgcrosswire/libsword/main # Creates a copy in main
cd main
# Look around with favourite editor, less, etc.

# Branch off a copy you want to make changes to
cd ~packages/sword/main
bzr branch ../fix-up-jonathans-mistakes # Use an appropriate branch name
cd ../fix-up-jonathans-mistakes
# Edit away to your hearts content:
bzr add filename  # adds a new file called filename
bzr mv file1 file2 # moves file1 to file2 and tells bzr it moved
bzr rm file3 # deletes file3 and tells bzr
bzr status # shows you what's up in this copy
bzr diff # diff against what you started with
# When you are at a suitable point in your work...
bzr commit -m "I fixed Jonathan's mistakes"  # commits changes
# Repeat editing cycle...
bzr commit -m "I fixed even more of his mistakes"
# When ready to show others...
bzr push lp:~pkgcrosswire/libsword/fix-up-jonathans-mistakes

# Now you can go to http://code.launchpad.net/~pkgcrosswire and look
# You can propose merges from here to the main branch if you like
# And request reviews from others.

# After being reviewed (or not!), when you want to do a merge:
cd ~packages/sword/main
bzr update # Make sure we're up to date
bzr merge lp:~pkgcrosswire/libswordfix-up-jonathans-mistakes
bzr commit -m "Merged fix-up-jonathans-mistakes branch"
bzr push lp:~pkgcrosswire/libsword/main

# Now main has your branch merged into it.

That's plenty for now!

Looks like we missed your deadlinel I'll try to Debianize the bibledit 
and biblememorizer packages tonight if other stuff allows -- my car 
broke down today!!

Jonathan