Split hinks ?
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Mar 26 08:32:30 GMT 2008
>>>>> "vila" == Vincent Ladeuil <v.ladeuil+lp at free.fr> writes:
>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:
aaron> Xavier Maillard wrote:
>>> I have tried bzr shelve function and I find it pretty basic,
>>> sorry.
>>>
>>> Is there a way to split a hunk into smaller hunks ? This is my
>>> first use of such tools.
aaron> When you want to get finer granularity than hunks, you
aaron> really want an editor.
vila> Indeed.
aaron> I use the "vimdiff" plugin. This lets me edit the
aaron> file in place, with a clear idea of what has changed.
aaron> I assume vimdiff is not to your liking, but Emacs must
aaron> also have a diff mode. You can invoke it with "bzr
aaron> diff --using $EMACS_DIFF $FILENAME"
vila> Or from inside emacs:
C-M-> bzr diff [path]
vila> M-x diff-mode
vila> And, once in diff-mode, you're free to use:
vila> - C-c C-c to go to the file referenced in the diff (you will be
vila> positioned at the exact char you cursor is on in the diff)
vila> - C-c C-a to apply/un-apply any hunk,
vila> - C-x C-w <file.patch> to save the patch for further reference
vila> (which basically gives you bzr shelf and strong basis for any
vila> cherry-pick for free :)
vila> Vincent
More information about the bazaar
mailing list