bzr shelve/unshelve should test the availability of diffstat before running it

[Michael Ellerman]

On Thu, 27 Oct 2005 00:53, Aaron Bentley wrote:
> Michael Ellerman wrote:
> > I've updated it to test that code and fixed it so it works :)
>
> Welcome to our happy family.  The latest code includes your new shelf.
>
> I have grafted your shelf_v2 branch onto bzrtools using "bzr merge
> -r0..-1".  That means you can continue to work in shelf_v2, and I will
> be able to merge you.

Cool, I was wondering if that would be easy or not, go bzr! :)

> You shouldn't merge from me, unless you want to turn shelf_v2 into a
> bzrtools branch.  Or you can work in a bzrtools branch.  Your call.

OK, I'll probably keep it seperate for the moment at least while I hack on it. 

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051027/6c8ba82f/attachment.pgp