[MERGE] BranchBuilder updates

Aaron Bentley aaron at aaronbentley.com
Tue Jul 22 21:08:13 BST 2008


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

John Arbash Meinel wrote:
> The one thing it doesn't support is "merge" because our merge code
> depends on having a real disk backing the WorkingTree.

I don't think that's accurate.  Merge works fine with a PreviewTransform
as the target, and I'm working on PreviewTree to make it acceptable as a
source.  PreviewTree/PreviewTransform do hit disk, but this an
implementation detail that can easily be changed.

> It also doesn't
> support "rename" yet, because MemoryTree doesn't.

PreviewTree does support rename.  Perhaps it would make sense to use it?

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

iD8DBQFIhj4t0F+nu1YWqI0RAhOOAKCBZ6IuPBfyt7WrTtiOdjBgzy0/YgCfXsM6
Zong6+CXeR342b/Smf73d7w=
=cK87
-----END PGP SIGNATURE-----



More information about the bazaar mailing list