how to merge bundles?

[Alexander Belchenko]

Aaron Bentley пишет:
> 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.

Hmm... And what the characteristic of well-formed bundle? Because I work
on windows I create the bundle with redirecting output to the file:

bzr bundle > bundle.file

And I get plain text file. Is line-endings of this file matters? Because
on win32 I have bundle.file with CRLF line-endings.

OK. I test merging of bundle in different situations.

1) Bundle is placed not in the root of branch but in .. directory. When
I run:

D:\user\MyCode\BJT\BJLogic\BJ.bugfix.test>bzr merge ..\bundle.file
bzr: ERROR: Not a branch: D:/user/MyCode/BJT/BJLogic/bundle.file/

The same behaviour when I run:

D:\user\MyCode\BJT\BJLogic\BJ.bugfix.test>bzr merge ../bundle.file
bzr: ERROR: Not a branch: D:/user/MyCode/BJT/BJLogic/bundle.file/

2) Bundle placed in the root of branch. When I run:

D:\user\MyCode\BJT\BJLogic\BJ.bugfix.test>bzr merge bundle.file
Nothing to do.

And actually bundle is not merged in.

Do I need to file bug report?


>>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.

Because in the bzr man help autogenerated from help output there is not
listed aliases to commands, so I think it may be confusing. I think I
should fix generation of man page text.

--
Alexander