[RFC] Multi-parent diffs
aaron.bentley at utoronto.ca
Tue Apr 10 12:37:13 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Matthew D. Fuller wrote:
> On Fri, Apr 06, 2007 at 02:31:03PM -0400 I heard the voice of
> Aaron Bentley, and lo! it spake thus:
>> I've drafted a spec for a new diff representation that I think we
>> should consider adopting:
> Peripherally related:
> It would be useful to be able to store diffs against a revision that's
> not one of the parents
Yes. In theory, it doesn't matter whether the parents are really parent
revisions, for the purposes of the diff.
(maybe even one that isn't in the ancestry).
> For one thing, this can lead to smaller diffs (in the extreme case,
> when you're just restoring the content of an old revision, your diff
> can become empty).
The problem is then: how to you handle the fact that the annotations are
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar