Full files in changesets?
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Apr 18 17:10:40 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Currently, bazaar-ng doesn't have a changeset format. If we're planning
on adding one, it would be for code exchange, and wouldn't be used by
the text store, as in Arch.
I wonder then, should it contain the full before and after texts of the
files?* The advantage would be for three-way merging. It would allow
the before-text to be used as the BASE and the post-text to be used as
the OTHER. So this would enable three-way merging, without requiring
access to the THIS and OTHER trees used to generate the changeset.
The knock-on effect is that you reduce the number of operators.
Everything is a three-way merge-- there's no 'exact patching'.
I have to say though, that reading patches in emails is a refreshing
change from the Arch mailing lists, which simply say "the code to
implement this is in foo at bar/baz--bzr--0". So maybe adding changesets
isn't even a good idea.
Aaron
- ---
*It's not actually necessary to include the full text of *both* files.
A full copy of one, plus a patch to transform it into the other would
suffice.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFCY9wA0F+nu1YWqI0RAhbiAJ40jhgotK7dpt1NxY9JykRfAL/JkACfarkK
eVgrGv5pPGARcLkw4AZjQB4=
=9HUN
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list