On 10/8/07, <b class="gmail_sendername">Alexander Belchenko</b> <<a href="mailto:bialix@ukr.net">bialix@ukr.net</a>> wrote:<div><span class="gmail_quote"></span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Martin Pool пишет:<br>> On 10/8/07, Anton Dedov <<a href="mailto:adedov@gmail.com">adedov@gmail.com</a>> wrote:<br>>> Hi!<br>>><br>>> I have a following problem with merging of bundles. I initialized bzr sample
<br>>> repository and then created two revisions there. After that I have branched<br>>> this repo and create a new revision in a new branch.<br>>><br>>> I create a bundle of a last revision of a second branch without accessing
<br>>> an initial one:<br>>> br2$ bzr send -r2..3 -o r3.bundle<br>>><br>>> But this bundle cannot be applied to a first branch, though it contains all<br>>> necessary revisions:<br>>> br1$ bzr merge ../br2/r3.bundle
<br>>> bzr: ERROR: Revision<br>>> {adedov@localhost-20071007162028-i0qvibjuszg06ksh} not<br>>> present in "inventory".<br>>><br>>> Whether it possible to address this issue?<br>>
<br>> I think that should work. Can you please use log --show-ids to check<br>> that adedov@localhost-20071007162028-i0qvibjuszg06ksh is the last<br>> revision on br1?<br><br>No, Martin, it will not work for reason Aaron know.
<br>Old bundle format does not have such problem.<br>So, Anton you could use `bzr bundle --format=0.9`<br>to produce full bundle with all revision info<br>inside and then teach your students to attach<br>bundle file manually.
<br>I'm also suggest my gzipped_bundle plugin<br>that especially useful for old bundle style.<br><br></blockquote></div><br>Will new-style bundles ever support work-flow initially described by me? Or I would need forever rely on obsolete format in case if I choose this way for my process?
<br clear="all"><br>-- <br>Anton Dedov