[ANN][Plugin] merge-into

Aaron Bentley aaron.bentley at utoronto.ca
Fri Feb 2 04:58:40 GMT 2007


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

John Arbash Meinel wrote:
> I just wrote a plugin which provides a single new command:
> 
>   bzr merge-into LOCATION SUBDIR

> I realize Aaron is doing much better work on nested-trees, and I think
> he is adding a command "join". I'm not trying to supersede his work, I
> just needed something for me, and figured other people might want it as
> well.

That looks more like my original concept.  join assumes you already have
LOCATION checked out in SUBDIR, and just turns them into a single tree,
preserving file-ids and history, and setting a merge.

I've certainly got no issue with you solving the problem this way,
though we could probably also get 'join' into the mainline early if you
want.

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

iD8DBQFFwsUA0F+nu1YWqI0RAu+1AJ0dUMT35YMFaE7LZXvIMeM3qmBFIACePgo3
X8mn4F4D6o5hIa/h2qvor7Y=
=3VLH
-----END PGP SIGNATURE-----



More information about the bazaar mailing list