Comment 5 for bug 260519

But join --reference will/would support the scenario I mentioned?

I wanted to use merge-into to support a vendor branch B (that gets regular updates by the vendor) included in my own projectA and applying local diffs to B. At certain times, I should be able to re-merge B into A, therefore applying the changes from the vendor but KEEPING my local diffs (manual conflict resolution, of course).

* merge-into only let's me merge the vendor branch once - no updates from the vendor ;( (Originally, I supposed, I could re-merge the branch and so apply the "new" changesets from the vendor)
* separated but nested trees lets me have vendor updates, but results in a patchwork of nested branches ;(
* "bzr join" equals merge-into (no more vendor updates after joining)
* "bzr join --reference" would keep the separated vendor branch (so updates worked) but include the diffs in my project branch?

Am I correct? If so, tell me how I can help/stress test ;)