tags

[Aaron Bentley]

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

Martin Pool wrote:

| the best way to do scalar merge of these things is likely to
| record each scalar as a stanza, e.g.
|
|   tag-name: bzr-0.8-foo
|   tag-target: mbp at fodiodisf-1230192301923
|   placed-in: mbp at fodiodisf-1230192301923
|
| And you could then use the placed-in field to do resolution of merges,
| rather than the weave annotations.

To do scalar merge, you'd need at least a 'supersedes:' field, listing
all the previous revisions that this revision should be preferred to.  I
think this ends up duplicating a lot of weave functionality.

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

iD8DBQFD+cFz0F+nu1YWqI0RAq90AJ49/2B/m6VNwoZiwPfS8APyL/GTLQCcDYx1
itMlLscRsjtncVvaKnRRlmY=
=8BM/
-----END PGP SIGNATURE-----