Cannot merge bundles created without referencing another branch.
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Oct 8 19:40:49 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Alexander Belchenko wrote:
> Aaron Bentley пишет:
>> Alexander Belchenko wrote:
>>> I don't know. IMO, it's the bug in new bundle format generation: without
>>> accessing to parent branch it should contain all info, as old bundle
>>> does.
>>
>> It's impossible to create a new-style bundle without referring to the
>> submit branch:
>>
>> $ bzr init foo
>> abentley at lappy:~$ cd foo
>> abentley at lappy:~/foo$ bzr commit --unchanged -mblah
>> Committing revision 1 to "/home/abentley/foo/".
>> Committed revision 1.
>> abentley at lappy:~/foo$ bzr send -o foo.bundle
>> bzr: ERROR: No submit branch known or specified
>>
>> If you there's a bug there, please describe exactly what.
>
> Original use case from Anton Dedov was:
> $ bzr send -r2..3 -o r3.bundle
Yes, and this as the same effect as I described above:
$ bzr init foo
$ cd foo
$ bzr commit --unchanged -mblah
Committing revision 1 to "/home/abentley/foo/".
Committed revision 1.
$ bzr commit --unchanged -mblah
Committing revision 2 to "/home/abentley/foo/".
Committed revision 2.
$ bzr commit --unchanged -mblah
Committing revision 3 to "/home/abentley/foo/".
Committed revision 3.
$ bzr send -r2..3 -o r3.bundle
bzr: ERROR: No submit branch known or specified
Now I should mention that `send` remembers the branch you specified
last. So if Anton had done this:
$ bzr send -r2..3 -o r3.bundle .
He could then do this:
$ bzr send -r2..3 -o r3.bundle
Using saved location: .
And that would produce a bundle containing no revisions, because the
submit branch, '.', already had all the necessary revisions.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHCnmx0F+nu1YWqI0RAoJzAJ9bcBI2bJxcyY3W3d4bnkie/4K0OQCfTgIk
7wjkwXqJGe8CkpzhnhCdElY=
=NUnV
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list