I think we can't have both of the following:
1) bzr not using the "--using tool" for added files, falling back to /usr/bin/diff.
2) bzr passing the --diff-options to the "--using tool" *and* to the /usr/bin/diff.
If 1) and 2) are both true, then we can run into situations where the same value of --diff-options gets passed to two different tools, leading to trouble. Do you agree?
My patch has the effect of making 2) false: it prevents passing the --diff-options to the /usr/bin/diff. But one could want to do exactly that.
Indeed, one could also want to run her "--using tool" on added files. So I'm beginning to think that maybe the issue is 1). Do you know a valid reason justifying 1) ?
Hi Richard,
Thanks for your explanation.
I think we can't have both of the following:
1) bzr not using the "--using tool" for added files, falling back to /usr/bin/diff.
2) bzr passing the --diff-options to the "--using tool" *and* to the /usr/bin/diff.
If 1) and 2) are both true, then we can run into situations where the same value of --diff-options gets passed to two different tools, leading to trouble. Do you agree?
My patch has the effect of making 2) false: it prevents passing the --diff-options to the /usr/bin/diff. But one could want to do exactly that.
Indeed, one could also want to run her "--using tool" on added files. So I'm beginning to think that maybe the issue is 1). Do you know a valid reason justifying 1) ?