Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Example of use of Shelve/Unshelve plugin

In case you want to see how Shelve/Unshelve from BzrTools work before installing it, here's an example:

$ bzr diff
=== modified file 'description.txt'
--- description.txt
+++ description.txt
@@ -2,7 +2,7 @@
 ===============
 
 These plugins
-by Michael Ellerman
+written by Michael Ellerman
 provide a very
 fine-grained 'undo'
 facility
@@ -11,6 +11,6 @@
 This allows you to 
 undo some of
 your changes,
-commit, and get
+perform a commit, and get
 back to where you
 were before.

$ bzr shelve1
--- description.txt
+++ description.txt
@@ -2,7 +2,7 @@
 ===============
 
 These plugins
-by Michael Ellerman
+written by Michael Ellerman
 provide a very
 fine-grained 'undo'
 facility

Keep this change? (1 of 2) [nydisq?] (n): y
--- description.txt
+++ description.txt
@@ -11,6 +11,6 @@
 This allows you to 
 undo some of
 your changes,
-commit, and get
+perform a commit, and get
 back to where you
 were before.

Keep this change? (2 of 2) [nydisq?] (n): n

Status:
  description.txt
    1 hunks to be shelved
    1 hunks to be kept

Shelve these changes, or restart? [yrsiq?] (y): y
Saving shelved patches to /tmp/proj/.bzr-shelf
Reverting shelved patches
Diff status is now:
 description.txt | 2 +-
 1 files changes, 1 insertions(+), 1 deletions(-)
$ bzr diff
=== modified file 'description.txt'
--- description.txt
+++ description.txt
@@ -2,7 +2,7 @@
 ===============
 
 These plugins
-by Michael Ellerman
+written by Michael Ellerman
 provide a very
 fine-grained 'undo'
 facility

$ bzr unshelve1
Reapplying shelved patches 
Diff status is now:
 description.txt | 4 ++--
 1 files changes, 2 insertions(+), 2 deletions(-)
$