marco.trevisan at canonical.com
Wed Jan 29 11:07:47 UTC 2014
Il giorno mer, 29/01/2014 alle 09.35 +1100, Christopher James Halse
Rogers ha scritto:
> On Tue, 2014-01-28 at 12:32 +0100, Marco Trevisan wrote:
> > 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.
Well, yes... It's quite similar, but you've to handle things in a
I mean, you have to select the hunks that you do NOT want to commit
(where in git add -p you select what you want to), so it works quite
well in practice, but I still miss the ability of splitting hunks or
editing them only before committing (i.e. if you left a debug line in
the middle, you can't just ignore that).
More information about the Mir-devel