Part of bzrlib
Class | WeaveContentFactory | Content factory for streaming from weaves. |
Class | Weave | weave - versioned text file storage. |
Class | WeaveFile | A WeaveFile represents a Weave on disk and writes on change. |
Function | _reweave | Combine two weaves and return the result. |
Function | _reweave_parent_graphs | Return combined parent ancestry for two weaves. |
This works even if a revision R has different parents in wa and wb. In the resulting weave all the parents are given.
This is done by just building up a new weave, maintaining ordering of the versions in the two inputs. More efficient approaches might be possible but it should only be necessary to do this operation rarely, when a new previously ghost version is inserted.
Parameters | pb | An optional progress bar, indicating how far done we are |
msg | An optional message for the progress |