merge-into - Make it easier to merge another project into this one

Version Not specified
Branch lp:bzr-merge-into
Home page https://launchpad.net/bzr-merge-into
Owner jameinel
GNU/Linux Yes
Windows Yes
Mac OS X Yes

Provide the ‘merge-into’ command.

This command allows you to merge other branches into subdirectories, rather than always merging into root, and then needing to be moved around.

merge-into

Purpose

Merge a branch into a subdirectory of the current one.

Usage

bzr merge-into LOCATION [SUBDIR]

Options

--usage Show usage message and options.
-v, --verbose Display more information.
-q, --quiet Only display errors and warnings.
-h, --help Show help message.

Description

LOCATION
The branch that will be merged into this one.
SUBDIR
The subdirectory that will be used for merging. (defaults to basename of LOCATION)

After running ‘bzr merge-into OTHER SUBDIR’ all of the files from OTHER will be present underneath the subdirectory SUBDIR.