Previewing changes

[Aaron Bentley]

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

Ben Finney wrote:
> Aaron Bentley <aaron at aaronbentley.com> writes:
> 
>> Ben Finney wrote:
>>> I'm very attached to 'diff --using foodiffprog'. Does 'merge
>>> --preview' allow specifying options to the 'diff' that is
>>> performed?
>> Not at present. It was a hard choice, but I thought it was more
>> important to provide all the options of merge than all the options
>> of diff, so I put this functionality in the merge command rather
>> than the diff command.
> 
> I'm glad that re-implementing 'diff' was rejected, but it's not what I
> was asking for.

It wasn't re-implementing diff-- it was the option of providing a way
for diff to diff against the merge into a tree (similar to "diff -r
submit:").


> Instead, I was asking: since 'merge' can now perform a
> 'diff', can we provide options to the 'diff' thus performed?

No, because that would mean permitting options to "merge" that do not
make sense for normal merge operations.

> That question assumes (correctly?) that 'merge' is using the bzr
> 'diff' command to do the 'diff' work, rather than re-implementing it.

Incorrect.  The diff is being generated using bzrlib functionality, not
using the diff command.  We do not encourage invoking commands from
other commands.

> I assume further that the answer to this question is also "no, there
> is no way to tell 'merge' the options it should give to the bzr 'diff'
> command".

Well, the answer is "no, there is no way to provide options to merge
that apply to the diff operation".

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

iD8DBQFIkEt70F+nu1YWqI0RAoBkAJ9nLX+NVuy1rJ1LTUSADppeZdZ8oQCaA8Ng
WDRThKDfB8VbuUr3s/auS8w=
=RUNG
-----END PGP SIGNATURE-----