add gbp-pull

1 files changed, 27 insertions, 0 deletions

diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn
index 34fdc0e..b737b0c 100644
--- a/development/debian_packages_in_git.mdwn
+++ b/development/debian_packages_in_git.mdwn
@@ -50,6 +50,33 @@ However you *can* push out patch-queue branches. Other team members must just be
 # Cloning a repository
 If you use *gbp-clone* instead of *git clone* to clone a remote repository it will automatically set up the *debian*, *upstream* and *pristine-tar* branches for you. The [manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.intro.html#GBP.REPOSITORY) explains the terminology.
 
+# Keeping a repository up to date
+After initially cloning with *gbp-clone* you can run *gbp-pull* to update your
+*debian*, *upstream* and *pristine-tar* branches from the remote site. So the
+complete workflow for simple team maintenance looks like this:
+
+    # Initially clone the repo once
+    gbp-clone git://git.debian.org/pkg-libvirt/gtk-vnc.git
+    cd gtk-vnc
+
+Work on that clone, commit, release, push, etc. Now after a couple of days you
+want to make more changes but don't know if another developer worked on it. So
+you do:
+
+    # Update to what others might have pushed
+    gbp-pull
+
+This will update all necessary branches to what other developers might have
+pushed in the meantime. If you're also using patch-queues as described above
+you additionally have to refresh your *patch-queue* branch:
+
+    # Update to what others might have pushed
+    git-branch -D patch-queue/master
+    gbp-pq import
+    git checkout master
+
+Future versions of *gbp-pull* will allow you to do all the above steps at once.
+
 # Preparing a Backport
 I keep backports on a separate *bpo-<release>* branch like *bpo-lenny*: