Splitting diff hunks in ‘shelve’

Aaron Bentley aaron at aaronbentley.com
Fri Sep 25 16:20:46 BST 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ben Finney wrote:
> One thing I'd love to see, though, is to be able to split a diff hunk
> that has entangled what I consider to be two or more separate changes,
> and be able to answer differently for each one.

Once you're working below hunk granularity, I think it makes more sense
to use a diff editor, 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

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

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkq838oACgkQ0F+nu1YWqI3cEwCfXtJ0cPcuZ0k37ia3kGUQdhp6
nO8AniKC6LG8C3teWuhmhVLBwO+cEpPT
=3Sd3
-----END PGP SIGNATURE-----



More information about the bazaar mailing list