pre-commit hooks and $Id$ banners?
Aaron Bentley
aaron.bentley at utoronto.ca
Wed Apr 26 18:57:02 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jan Hudec wrote:
>>Many script authors assume two
>>files
>>are identical if their diff is empty.
>
>
> Picky note: you mean the other way 'round -- if their diff is non-empty, they
> are changed.
It would not surprise me if many script authors assume exactly what John
posted. An empty diff does mean no content differences, AFAIK.
('Binary files differ' is not 'empty')
> While you don't want any diff output if only keyword expansion changes, you
> usually want the diff to apply cleanly to the working tree.
I think you also want the diff to apply cleanly to someone else's
working tree, which may not have the same expansion.
> You even usually
> assume, that if you make a diff between two revisions and than apply it to
> exported working tree from the first, you get the secodn -- and that means
> doing the diff on the *external* representation, ie. with keywords
> *expanded*. But that's the reason I say we want both ways.
An alternative would be diff the internal representation, and to do
patch application on the internal representation, also. That would
allow patches with differing line endings to work properly.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFET7Ru0F+nu1YWqI0RAvhQAJ9ScTx/Y7piPk6jBQGHzwGzHJRwZwCfZYsr
mGkasW3THPUIcdhCyG1Cs6s=
=XYt+
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list