From 2a5325159dbd94d7d815e13a0809004f0af57ff7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 12 Mar 2015 10:27:52 +0000 Subject: [PATCH] Update link to "bzr shelve" example --- content/bzr-shelve.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/bzr-shelve.md b/content/bzr-shelve.md index 2b05b125..05f3d8c3 100644 --- a/content/bzr-shelve.md +++ b/content/bzr-shelve.md @@ -13,14 +13,14 @@ bother with revision control if I'm just tweaking somebody else's Debian source package a bit (in which case I just use debdiff for paranoia). Using bzr at work, though, I think I just found my killer app in Michael -Ellerman's [shelve](http://bazaar.canonical.com/BzrShelveExample) plugin. -My working style generally involves alternating between doing lots and lots -of stuff in the one working copy and (after testing) going through and -committing it in logical chunks. This is fine if everything's in separate -files (most revision control systems let you commit just some files), but if -several of the chunks are in the one file then I'm reduced to saving diffs -and manually editing out the bits I don't want to commit yet, which is -obviously pretty tedious and error-prone. +Ellerman's [shelve](http://wiki.bazaar.canonical.com/BzrShelveExample) +plugin. My working style generally involves alternating between doing lots +and lots of stuff in the one working copy and (after testing) going through +and committing it in logical chunks. This is fine if everything's in +separate files (most revision control systems let you commit just some +files), but if several of the chunks are in the one file then I'm reduced to +saving diffs and manually editing out the bits I don't want to commit yet, +which is obviously pretty tedious and error-prone. `bzr shelve` presents each diff hunk in your working copy to you in turn and asks you whether you want to keep it. If you say no, that hunk gets -- 2.30.2