[Bug 4741] bzr shelve is confusing to me

[Jan Hudec]

On Tue, Nov 29, 2005 at 22:19:59 -0500, James Blackwell wrote:
> On Thu, Nov 24, 2005 at 02:48:52PM -0500, Brad Bollenbach wrote:
> > I'm looking for undo behaviour, which implies redo. If, as you  
> > suggest later, there were something to undo a revert, then yes, bzr  
> > revert would be what I want.
> > 
> > A common use case for undo/redo, IME, is waking up in the morning,  
> > undo'ing changes I've made on a branch, synching down the latest  
> > version of HEAD, and then redo'ing my changes back onto the branch to  
> > make sure I'm synched up and the conflict pain is kept to a minimum.
> 
> I know that its not quite the answer you're looking for, but there is
> another behaviour that you can perform that will also minimize conflict
> pain:
> 
> $ bzr branch url code
> $ hack, hack, hack commit
> $ bzr merge
$ bzr commit
> $ hack, hack, hack commit
> $ bzr merge
$ bzr commit
> $ hack, hack, hack, sleep
> $ # Good morning
> $ bzr st; bzr diff
> $ commit
> $ bzr merge
$ bzr commit
> $ hack, hack, hack commit
> $ merge request

... you should commit after a merge before hacking on.

--
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051130/de4fe386/attachment.pgp