Bite size

Christopher James Halse Rogers raof at ubuntu.com
Tue Jan 28 22:35:50 UTC 2014


On Tue, 2014-01-28 at 12:32 +0100, Marco Trevisan wrote:
> Il giorno mar, 28/01/2014 alle 14.47 +0800, Daniel van Vugt ha scritto:
> >    1. Create a diff: bzr diff --old :parent > ~/bigone.diff
> >    2. Create a new branch and reapply the changes:  patch -p0 < 
> > ~/bigone.diff
> >    3. Identify changes to drop: bzr status or bzr diff
> >    4. Drop them: bzr revert path/to/files
> 
> Instead of doing this manually, line per line, I think that bzr
> (q)shelve can be very useful to stash chunks of sub-file changes in a
> quicker way... BTW I wish we had something like bzr add --patch :(

Isn't “bzr shelve” the (almost exact¹) dual of what “bzr add --patch”
would be?

¹: The thing that I miss from git add -p is the ability to split hunks
of diff. This shouldn't actually be hugely difficult, but I've never got
around to fixing it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/mir-devel/attachments/20140129/115990d5/attachment.pgp>


More information about the Mir-devel mailing list