[MERGE] Diff now emits files in alphabetical order
Aaron Bentley
aaron.bentley at utoronto.ca
Wed Dec 19 15:24:03 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Andrew Bennetts wrote:
>> + elif changed_content:
>> + self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
>> + newpath_encoded, prop_str))
>
> Should there be an “else: raise AssertionError('unknown change')” here,
> just in case? Or are there changes that this routine is expected to ignore?
I think that was a thinko. It should mention files with modified
properties as well. In fact, the way we invoke iter_changes, it won't
talk about unmodified files, so I'll just change it to
else:
self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
newpath_encoded, prop_str))
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHaTeT0F+nu1YWqI0RAkqeAJ0VJVPYADWsf5r855gE/q6FYCnqsgCdGd9m
5Au4o26O2RRRMjzRcQagGrE=
=GWKo
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list