Splitting diff hunks in ‘shelve’

Ben Finney ben+bazaar at benfinney.id.au
Sat Sep 26 01:45:53 BST 2009


Aaron Bentley <aaron at aaronbentley.com> writes:

> Once you're working below hunk granularity, I think it makes more
> sense to use a diff editor

That makes sense, yes.

> so I have a branch that allows you launch an editor such as gvimdiff
> for a given file:
>
> bzr+ssh://bazaar.launchpad.net/~abentley/bzr/shelve-editor

Do you have a public URL? That URL fails because I don't have SSH access
on that host.

> It needs a bit more cleanup before I submit it for merging, but it
> works nicely for me.

Based on your description above, I already have a feature request :-)

Please support the ‘--using fooprog’ option (from ‘bzr diff’), to allow
launching ‘fooprog’ as the merge tool instead of the default program.

-- 
 \          “I see little commercial potential for the Internet for at |
  `\                               least ten years.” —Bill Gates, 1994 |
_o__)                                                                  |
Ben Finney
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090926/202bd5ad/attachment.pgp 


More information about the bazaar mailing list