-
Committer:
Michael Ellerman
-
Date:
2005-11-29 07:12:26 UTC
-
mto:
(0.3.1 shelf-dev)
(325.1.2 bzrtools)
-
mto:
This revision was merged to the branch mainline in
revision
334.
-
Revision ID:
michael@ellerman.id.au-20051129071226-a04b3f827880025d
Unshelve --pick was broken, because we deleted the whole patch, even when only
part of it was unshelved. So now if we unshelve part of a patch, the patch is
replaced with a new patch that has just the unshelved parts. That's a long way
of saying it does what you'd expect.
Implementing this required changing HunkSelector to return both the selected,
and unselected hunks (ie. patches to shelve, and patches to keep).