On 10/8/07, <b class="gmail_sendername">Martin Pool</b> <<a href="mailto:mbp@sourcefrog.net">mbp@sourcefrog.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;">
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>><br>> And a related question. Actually, I am trying to think out a process for<br>> reviewing students' code. I am conducting programming lectures, where I must<br>> search students works for language misuse and design mistakes. I have
<br>> experienced some PITA with accepting/reviewing tgz files by email. And I<br>> would like to organize a process that could make my task more comfortable<br>> and less routine.<br>><br>> I thought that students could send me a bundles of their revisions since the
<br>> last review. But my experiment uncover some obstacles for that. And I don't<br>> know whether it is a bug in bzr or wrong tool usage (and, therefore, wrong<br>> approach I think of)? I dunno.<br><br>I think that's a good idea. Normally your students should be able to
<br>just use send without a -r parameter and it will automatically<br>calculate what needs to be sent.</blockquote><div><br>So I need make branches, that I receive and construct from a students' bundles, available via network in order they could use "send" without -r option?
<br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">--<br>Martin<br></blockquote></div><br clear="all"><br>-- <br>Anton Dedov