[15:54] <quicksilver> am I correct to think there is no way to pass --diff-options to bzr merge --preview?
[15:54] <quicksilver> (I want to ignore whitespace on the preview diff)
[15:56] <fullermd> I'd guess that, yeah.
[15:57] <quicksilver> I will make do with bzr --old . --new ../other-branch
[15:57] <fullermd> You could just merge ; diff ; revert.
[15:57] <quicksilver> which does support --diff-options (but isn't quite the same)
[15:57] <quicksilver> yeah or I could work out the common ancestor by hand
[15:57] <quicksilver> and do bzr diff -r1.2.3
[15:58] <fullermd> Well, that wouldn't tell you near so much.
[15:58] <fullermd> And you don't have to do that by hand, you can ues ancestor:
[15:58] <quicksilver> ?
[15:59] <fullermd> cd branch_to_merge ; bzr diff -rancestor:/branch/to/merge/into..-1
[16:00] <quicksilver> nice!
[16:00] <quicksilver> do you have a workflow for merge review that goes a different way around?
[16:00] <quicksilver> that's what I'm doing...
[16:01] <fullermd> I always just do the merge and then check it out.
[16:01]  * quicksilver nods
[16:01] <fullermd> I'd actually long forgotten there even was a merge --preview.
[16:01] <quicksilver> I think I broke that habit because of the way merge+revert gets upset by new directories and cruft from conflicts
[16:02] <quicksilver> I mean it's not the end of the world, it's not that hard to clear up
[16:02] <quicksilver> although if a directory got renamed and there was a conflict it is a pain.
[16:02] <fullermd> I'd think revert should clear it out regardless.
[16:03] <fullermd> If you're doing it in some sort of automation, it's easy enough to just do it in a temporary scratch checkout.
[16:03] <quicksilver> revert won't delete the .OTHER, .BASE, .MINE files
[16:03] <quicksilver> and if those files are in the directory it wante dto delete
[16:03] <quicksilver> it then won't delete the directory
[16:07] <fullermd> Ah.  I guess I don't run into that often enough for it to register.
[16:13] <quicksilver> it's not really a big problem, but it's what provoked me to learn about merge --preview ;)
[16:16] <fullermd> I figure it's a social problem; somebody has diverged too far and needs to be beaten  ;)
[16:16] <quicksilver> haha