pre-commit hooks and $Id$ banners?

[Aaron Bentley]

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

Jan Hudec wrote:
> On Wed, Apr 26, 2006 at 13:57:02 -0400, Aaron Bentley wrote:
>>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')
> 
> 
> Yes, but that is an argument for diffing with expanded keywords rather than
> collapsed, which is how I unerstod the original thougt.

I expect there are arguments that can be made both for and against
treating two different expansions of the same internal representation as
different.  I think it's simplest to treat two files as identical if
they have the same internal representation.  Otherwise, bzr diff is next
to useless.

>>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.
> 
> 
> Yes -- but would need a bzr-aware patch. Ie. we can have bzr changesets that
> will work properly on working trees with different expansions, but they won't
> be always applicable by standard diff.

There is already a patch command in bzrtools.  It would need some
tweaking to get it to accept two files as input, I suppose.

> Note, that applying such changeset is still not trivial, because the
> conversion to internal format and back is not necessarily identity.

I think it's simplest to require that such conversions be identity
conversions.  Are there examples in which you think they shouldn't be?

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

iD8DBQFET8No0F+nu1YWqI0RAjzxAJ9kulLa7Se6XRsTpS8qRZ9kfwS3BwCfcT0L
W1tEPnKlZzkv/7mRgRywgrg=
=8gjt
-----END PGP SIGNATURE-----