scmbug_merge

Langue: en

Version: 12 February 2008 (mandriva - 01/05/08)

Section: 1 (Commandes utilisateur)

NAME

scmbug_merge - Merges the work done on a list of bugs against an existing branch

SYNOPSIS

scmbug_merge --scm=SCM_NAME --repository=REPOSITORY_PATH --product=PRODUCT_NAME --commit-bugs=COMMIT_BUG_LIST --merge-bugs=MERGE_BUG_LIST --base-label=BASE_LABEL_NAME [ --target-label=TARGET_LABEL_NAME ]

DESCRIPTION

Merges the work done on a list of bugs against an existing branch.

USAGE

Run with all required parameters.

OPTIONS

The parameters are:

--scm=SCM_NAME
The name of the SCM system. Valid options are:
CVS
Subversion
--repository=REPOSITORY_PATH
The path to the SCM repository.

When using for CVS, this should be set to the contents of the CVSROOT variable.

When using for Subversion, this should be prefixed with file://.

--product=PRODUCT_NAME
The name used in the bug-tracking system to track defects for the product developed under the SCM system.
--merge-bugs=MERGE_BUG_LIST
A comma-separated list of bug ids whose activity will be merged.
--commit-bugs=COMMIT_BUG_LIST
A comma-separated list of bug ids against which the merge will be recorded in the bugtracker.
--base-label=BASE_LABEL_NAME
The base branch name.
--target-label=TARGET_LABEL_NAME
The target branch name. If this option is not supplied then the changes defined by the --bugs option will be applied directly in the label defined by --base-label.

EXAMPLES

MERGING BUG CHANGES IN A CODEBASE BASED ON AN EXISTING TAG AND APPLYING A NEW TAG IN SUBVERSION

scmbug_merge --scm=Subversion --product=TestProduct --repository=/tmp/testrepository --base-label=tags/SOMEPRODUCT_RELEASE_1-3-0 --new-branch=tags/SOMEPRODUCT_RELEASE_1-3-1 --merge-bugs=545,591 --commit-bugs=771

MERGING BUG CHANGES DIRECTLY IN AN EXISTING BRANCH IN SUBVERSION

scmbug_merge --scm=Subversion --product=TestProduct --repository=/tmp/testrepository --base-label=branches/SOMEPRODUCT_RELEASE_1-x-0-series --merge-bugs=708 --commit-bugs=771

VERSION

RELEASE_0-23-4

BUGS

This tool needs improvement. The list of bugs is available at the project's bug-tracking system <URL:http://bugzilla.mkgnu.net>, under the 'Tools' component.

REPORTING_BUGS

Please report bugs at the project's bug-tracking system <URL:http://bugzilla.mkgnu.net>.

SEE ALSO

The Scmbug manual <URL:/usr/share/doc/scmbug-doc/manual>, provided by the package scmbug-doc.

AUTHOR

The Scmbug Team <URL:http://freshmeat.net/projects/scmbug>.