Help with Bzr-Git

[Daniel Carrera]

Hi John,

On Wed, Jul 14, 2010 at 6:23 PM, John Arbash Meinel
<john at arbash-meinel.com> wrote:
> It would, but your context lines aren't quite enough. Specifically,
> Unified diff defaults to (IIRC) 3 lines of context. Add another "Line
> 4\nLine 5" and I think the hunks will be separate.

Nope. I just tried with 5 lines and even 7 lines, no difference.


> If you set "change_editor = ???" in ~/.bazaar.conf and it will let you
> press "e" to edit the changes that are displayed. Which lets you create
> a smaller diff hunk.
>
> For example, on Windows I have:
> change_editor = "C:/Program Files/Vim/vim72/gvim.exe -d"
>
> Which brings up gvim's side-by-side diff mode, which makes it pretty
> easy to set up what content you want to keep, and everything else will
> get shelved.

Can I just just any editor (e.g. nano) or does it have to be something
with "side-by-side diff mode"?

I just tried this:

echo 'change_editor = nano' > ~/.bazaar.conf
bzr shelve

And when I pressed "e" it just quit.

Daniel.
-- 
No trees were killed in the generation of this message. A large number
of electrons were, however, severely inconvenienced.