There are times when projects are developed separately, and need to be merged into a larger project. (multiple libraries combining into a single project, etc).
This plugin provides a simpler syntax for doing just that:
bzr merge-into ../other subdir
Will merge the 'other' project into subdirectory 'subdir' with all files showing up underneath 'subdir/'
If 'other' has a unique tree root, it will preserve that value. If it doesn't it will create a new file id for the merged location.
All code Code
- Version control system:
- Programming languages:
All bugs Latest bugs reported
Bug #697681: bzr: ERROR: The file id "TREE_ROOT" is not present in the tree None.
Reported on 2011-01-05
Bug #486245: incompatible with 2a repositories
Reported on 2009-11-21
Bug #425623: feature request: merge-into for selected files only
Reported on 2009-09-07
Bug #260519: 'bzr merge-into' doesn't support merging a project into an existing subdirectory
Reported on 2008-08-22
Bug #252188: subdir is always from repo root, not current dir
Reported on 2008-07-26