[merge] bzr missing replacement

Aaron Bentley aaron.bentley at utoronto.ca
Mon Dec 12 00:33:52 GMT 2005


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

Please merge from http://panoramicfeedback.com/opensource/bzr.ab

This contains a replacement for the merge command, based on work by
Daniel Silverstone.

The essential difference between it and the old --missing is that it
treats merged revisions as 'not missing', while the original treated any
revision not in the revision-history as 'missing', even if merged.

Additionally, it is bidirectional, so it will report on locally-present
revisions that are missing from the other branch.

It supports every option from the old 'missing' command.  It also has
the questionable behavior of setting the branch parent if unset, just
like the original.

Additionally, it supports multiple log formats, shows logs in
newest-to-oldest order, and can make you breakfast in bed.

Note that this is the only change currently present in bzr.ab.  I have
undone the merge fix that had no testcase.

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

iD8DBQFDnMVw0F+nu1YWqI0RAuD9AJ9UAGbGguICfgo6RpGl3msofz6iFACcDoow
RuNuW1grWK5N43x6I2Le0Wo=
=bqli
-----END PGP SIGNATURE-----




More information about the bazaar mailing list