how to merge bundles?

[Aaron Bentley]

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

Alexander Belchenko wrote:
> I think this question mostly addressed to Aaron Bentley.
> 
> I see that implementation bundles-revisions (aka changesets in the past)
> is merged into mainline of bzr.dev 0.9.
> 
> Today I test it and faced with the problem: I cannot merge bundle. Help
> of bundle command says that I need to use merge command. But in merge
> help there is no information how to do this operation. I try just:
> 
> bzr merge bundle.file
> 
> and got error:
> 
> bzr: ERROR: Not a branch: D:/user/Bundle-test/bundle.file/

That error should be changed to:

ERROR: Not a branch or valid bundle: D:/user/Bundle-test/bundle.file.

There is no special command or option -- if a file is a valid bundle, it
will be used.

> What I do wrong? Is I need to use special option? But in the merge help
> there is no additional options related to merging bundles.

Most likely, a bad pathname, possibly a malformed bundle.

> And next minor remark: canonical name of command that create bundle is
> 'bundle-revisions' with alias to 'bundle'. But in the help there is
> examples that use just 'bundle' as commands. If you prefer 'bundle' as
> primary name then I think it should be canonical name and
> 'bundle-revisions' as alias. 

I like bundle-revisions appearing in the help summary, so I don't have a
problem with updating the examples.

> Instead users will be confusing by this
> mix.

I don't think it's very confusing, but I don't have a problem with
changing it.

> And there is no entry in the NEWS file.

Sure.

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

iD8DBQFEhVi60F+nu1YWqI0RAkOmAJ47g4ZjEhXLseJ+xJ13ZEq3Jiw8swCdGUo6
twB6nHtZzEs83oOAQvmrFNA=
=JGcF
-----END PGP SIGNATURE-----