[MERGE] Implement diff --using natively

Aaron Bentley aaron at aaronbentley.com
Sat Dec 29 04:12:03 GMT 2007


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

Robert Collins wrote:
> On Fri, 2007-12-28 at 10:30 -0500, Aaron Bentley wrote:
>> Robert Collins wrote:
> Isn't GNU diff
> 0 - no change
> 1 - change
> 2 - unrepresentable change
> other - error

No, 2 also indicates wrong parameters:

$ diff --booga
diff: unrecognized option `--booga'
diff: Try `diff --help' for more information.
abentley at lappy:~/bzrplugins/extmerge$ echo $?
2

> I'm inclined to prefer that users have a wrapper script for arbitrary
> tools so that we can rely on exit codes.

I really don't want to.  Fine as an optional thing, but I think it's
extra work that most users won't feel they benefit from, and probably
much simpler to do from inside Bazaar.

> Ah right. You might have some issues on windows though unless your
> command is literally 'python file1 file2' in which case I can imagine
> strange things happening anyway ;).

It is: python -c 'print "%(old_path)s %(new_path)s"'

Aaron

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

iD8DBQFHdckS0F+nu1YWqI0RAttHAJ9TFLtG9zfka3qon2qsOfWfP2WZewCeJTlF
YsIvhPYqLemKooXp8w5GtLg=
=NNi9
-----END PGP SIGNATURE-----



More information about the bazaar mailing list