MERGE ping

[Aaron Bentley]

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

Martin Pool wrote:

| Rather than treating the conflict list as a set of "lines" perhaps they
| should be conflict objects.  We could have a ConflictSet object and
| change select_conflicts() into a method on that, perhaps called
| remove_all() and remove_paths().  Rather than having conflicts with
| different titles, we can just have subclasses of Conflict.
| The details of how these are packed can then be part of the workingtree
| format.
|
| The methods like "conflict_stanzas" and "stanza_conflicts" could be more
| explicit as "conflicts_to_stanzas", etc.

I've done a bunch of this now.  It's at:
http://code.aaronbentley.com/bzr/bzrrepo/bzr.ttransform/

- - ConflictSets aren't done yet.
- - serialization is handled by the Conflict objects, because it seemed
like a nice, straightforward approach.

The name "conflict_lines" on WorkingTree methods don't make much sense
now.  Any suggestions?

Probably got another couple hours to go on this.

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

iD8DBQFEM1Lx0F+nu1YWqI0RAk6FAJ0abthaCBDhwK+d2tR/prjL7rXhHgCfWe7J
XLuT0Y004cu5JeuBTyrjxFg=
=jEDw
-----END PGP SIGNATURE-----