Merge progress

[Aaron Bentley]

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

Hi all,

I've made some progress on bzr merge.  Here are the Arch coordinates:
aaron.bentley at utoronto.ca--baz/bazaar-ng--0--patch-19
http://push.sourcecontrol.net/~abentley/archives/baz/

Current status
==============
- - Merge command implemented
- - adds, removes, renames handled (removes are treated as deletes)
- - can use working directories or past revisions as input
- - must be invoked from tree-root of the tree to modify
- - updates inventory, but not other metadata like revision history
- - changed-file detection is not optimized
- - lots of unused files, because this code comes from BaZing, my aborted
attempt to implement mpool's ideas.
- - no conflict handling yet
- - no smart BASE revision selection yet.

Command syntax
bzr merge OTHER BASE
OTHER and BASE are paths, or path at revno

Examples:
# transform the versioned part of '.' into ../other
$ bzr merge ../other .

# revert the above change
$ bzr merge .@(bzr revno) .

# cherry-pick the changes in revisions 155-157 in other
$ bzr merge ../other at 154 ../other at 157

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

iD8DBQFCZqui0F+nu1YWqI0RAmqEAJ9DZQaoylJdAuHrhh27bSgg4wSQLgCcDkLZ
JCDqO57KGbSmrfFGdEDqpyU=
=8StS
-----END PGP SIGNATURE-----