[rfc] [merge] removal of support for reverse changeset application
Aaron Bentley
aaron.bentley at utoronto.ca
Thu Dec 22 20:38:09 GMT 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Denys Duchier wrote:
> Reverse changeset application can just as well be achieved by
> reversing the changeset itself (i.e. exchanging the sides) and then
> applying it forward. Aaron concurs.
This looks good, though you've trimmed a bit too much whitespace here:
@@ -301,8 +295,6 @@
if conflict_handler.missing_for_rm(filename, undo) ==
"skip":
return
- -
- -
def reversed(sequence):
max = len(sequence) - 1
for i in range(len(sequence)):
@@ -344,20 +336,14 @@
> It also simplifies the task of directly computing the resulting inventory
> from the changeset (so I have a vested interest in this
> simplification).
I still don't agree that computing the inventory from the changeset is
the right approach. Since you want to mark the predecesors for files
that have had merges, it would make sense to do it when you actually
perform the merges, i.e. as metadata changes in apply_changeset.
+1 to these changes, though.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDqw6x0F+nu1YWqI0RAob3AJ9qJfFaiZBQLWXWKmwwW/W5ve5MVQCeIBlZ
RKCv3x5vHpIgTYAhXWzcIsQ=
=p3X7
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list