tree-less merges

Aaron Bentley aaron.bentley at utoronto.ca
Tue Nov 20 23:20:34 GMT 2007


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

Michael Hudson wrote:
> I talked to John and Robert a bit about this in #bzr.  John suggested
> creating a LazyWorkingTree type (which had been my first thought too),
> but Robert (and Aaron overnight) suggested that subclassing Merger or
> TreeTransform might work better instead.  This makes sense to me, but
> both transform.py and merge.py make my head hurt[1], so I'd really
> appreciate a few hints as to where to start with this.

Here's the sort of thing I was talking about.  The idea is to implement
a variant of Transform that lets you get a PreviewTree.  The PreviewTree
should implement enough of the Tree interface that you can run
show_diff_trees against it, but that's all.

Then you run merge using this special TransformPreview, get the preview
tree, and run your diff.

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

iD8DBQFHQ2vC0F+nu1YWqI0RAuS1AJ42RjaVgWx4LvzPMBq2jr1BQjNLYQCfZqTd
b8r/BWhRK78tT2EWdEnAaPQ=
=ygiN
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: transform-preview.patch
Type: text/x-diff
Size: 13542 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071120/b1dd9d02/attachment.bin 


More information about the bazaar mailing list