Contents of .bzr/merged-patches

[Aaron Bentley]

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

I'd like to propose that, in addition to literally merged patches, the
.bzr/merged-patches file should list all patches whose changes are
reflected in the tree.

In other words, it should contain ancestor patches, as well as merged
patches.

The reason I suggest this is because patches may be un-merged, including
ancestor patches.  Since ancestor patches may be un-merged, you can't
determine which changes are reflected in the tree by examining
revision-history and merged-patches.  And that makes smart BASE
selection hard.

If this change were done, an un-merging (e.g. bzr merge . at 25 . at 24) would
~ remove the merged-patches entry for @25.  This is roughly the model of
Arch tree logs.

With Arch, though, merged-patches is conflated with revision-history, so
baz replay --reverse $(baz tree-id) will change the output of baz
tree-id.  Since revision-history is separate in bzr, this won't happen
unless we deliberately change revision history, too.

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

iD8DBQFCZq+l0F+nu1YWqI0RAmVFAJ9UN+cWxv43rVcvmXZ4DFkFMXwiEgCeOq0v
CpTkwgV4dWZSeqcAVNPSqaA=
=nYPL
-----END PGP SIGNATURE-----