version 1.1, 2006/03/08 19:30:24
|
version 1.4, 2006/03/09 20:03:32
|
|
|
### The following are directory position independent. | ### The following are directory position independent. |
### branch_create, branch_delete, branch_rename | ### branch_create, branch_delete, branch_rename |
### branch_lists, usage usage_all | ### branch_lists, usage usage_all |
### deaults, branch_diff_to_root, branch_diff_to_trunk |
### defaults, branch_diff_to_root, branch_diff_to_trunk |
### branch_diff_unmerged_branch, | ### branch_diff_unmerged_branch, |
### branch_diff_unmerged_trunk | ### branch_diff_unmerged_trunk |
### | ### |
|
|
## branch_create | ## branch_create |
## branch_rename | ## branch_rename |
## branch_delete | ## branch_delete |
## branch_check_out |
## branch_checkout |
## branch_check_in |
## branch_commit |
## branch_diff_to_root | ## branch_diff_to_root |
## bracnh_diff_unmerged_branch | ## bracnh_diff_unmerged_branch |
## branch_diff_unmerged_trunk | ## branch_diff_unmerged_trunk |
## branch_diff_to_head |
## branch_diff_to_trund |
## branch_merge_in | ## branch_merge_in |
## branch_merge_out | ## branch_merge_out |
## branch_migrate | ## branch_migrate |
|
|
## | ## |
## Branch and branch management tag naming convention | ## Branch and branch management tag naming convention |
## | ## |
## TASK-[BRANCH_NAME]-[ACTION]_[DIRECTION]_[LOCATION] |
## TASK_[BRANCH_NAME]-[ACTION]_[DIRECTION]_[LOCATION] |
## | ## |
## Where: | ## Where: |
## TASK - is constant to associate all tags to a TASK branch | ## TASK - is constant to associate all tags to a TASK branch |
|
|
## Note that the ACTION branch does not have a DIRECTION or LOCATION | ## Note that the ACTION branch does not have a DIRECTION or LOCATION |
## as it is the branch. | ## as it is the branch. |
## | ## |
## (1) TASK-[BRANCH NAME]-root - tag on trunk representing the |
## (1) TASK_[BRANCH NAME]-root - tag on trunk representing the |
## root of the branch. | ## root of the branch. |
## | ## |
## (2) TASK-[BRANCH NAME]-branch - head of the branch |
## (2) TASK_[BRANCH NAME]-branch - head of the branch |
## | ## |
## | ## |
## (3) TASK-[BRANCH NAME]-merged_out_from_trunk - The tag on the trunk which |
## (3) TASK_[BRANCH NAME]-merged_out_from_trunk - The tag on the trunk which |
## marks the place where the last merge out operation occurred. | ## marks the place where the last merge out operation occurred. |
## It could also be said that changes on the trunk up | ## It could also be said that changes on the trunk up |
## to this label are contained on the branch. | ## to this label are contained on the branch. |
## | ## |
## (4) TASK-[BRANCH NAME]-merged_out_to_branch - The tag on the branch which |
## (4) TASK_[BRANCH NAME]-merged_out_to_branch - The tag on the branch which |
## marks the place where the last merge out operation occurred. | ## marks the place where the last merge out operation occurred. |
## | ## |
## (5) TASK-[BRANCH NAME]-merged_in_to_trunk - The tag on the trunk which |
## (5) TASK_[BRANCH NAME]-merged_in_to_trunk - The tag on the trunk which |
## marks the place where the last merge in operation occurred. | ## marks the place where the last merge in operation occurred. |
## | ## |
## (6) TASK-[BRANCH NAME]-merged_in_from_branch - The tag on the branch which |
## (6) TASK_[BRANCH NAME]-merged_in_from_branch - The tag on the branch which |
## marks the place where the last merge in operation occurred. | ## marks the place where the last merge in operation occurred. |
## It could also be said that changes on the branch up to | ## It could also be said that changes on the branch up to |
## this label have been merged into the trunk. | ## this label have been merged into the trunk. |
|
|
## | ## |
## For Example if the branch name is PEPXX_FUNC then the following tags will | ## For Example if the branch name is PEPXX_FUNC then the following tags will |
## be in use: | ## be in use: |
## TASK-PEPXX_FUNC-root |
## TASK_PEPXX_FUNC-root |
## TASK-PEPXX_FUNC-branch |
## TASK_PEPXX_FUNC-branch |
## TASK-PEPXX_FUNC-merged_in_to_trunk |
## TASK_PEPXX_FUNC-merged_in_to_trunk |
## TASK-PEPXX_FUNC-merged_out_from_trunk |
## TASK_PEPXX_FUNC-merged_out_from_trunk |
## TASK-PEPXX_FUNC-merged_in_from_branch |
## TASK_PEPXX_FUNC-merged_in_from_branch |
## TASK-PEPXX_FUNC-merged_out_to_branch |
## TASK_PEPXX_FUNC-merged_out_to_branch |
## | ## |
## | ## |
## Consider the following diagram: | ## Consider the following diagram: |
|
|
# | # |
exists_MAKE: FORCE | exists_MAKE: FORCE |
ifeq ($(MAKE_FULL_PATH),) | ifeq ($(MAKE_FULL_PATH),) |
$(error MAKE command ($(MAKE)) not found in PATH $(PATH)) |
$(error ERROR: MAKE command ($(MAKE)) not found in PATH $(PATH)) |
endif | endif |
| |
| |
|
|
# | # |
exists_CVS: FORCE | exists_CVS: FORCE |
ifeq ($(CVS_FULL_PATH),) | ifeq ($(CVS_FULL_PATH),) |
$(error CVS command ($(CVS)) not found in PATH $(PATH)) |
$(error ERROR: CVS command ($(CVS)) not found in PATH $(PATH)) |
endif | endif |
| |
| |
|
|
# | # |
exists_PATCH: FORCE | exists_PATCH: FORCE |
ifeq ($(PATCH_FULL_PATH),) | ifeq ($(PATCH_FULL_PATH),) |
$(error PATCH command ($(PATCH)) not found in PATH $(PATH)) |
$(error ERROR: PATCH command ($(PATCH)) not found in PATH $(PATH)) |
endif | endif |
| |
# ====================== | # ====================== |
|
|
# | # |
exists_GREP: FORCE | exists_GREP: FORCE |
ifeq ($(GREP_FULL_PATH),) | ifeq ($(GREP_FULL_PATH),) |
$(error GREP command ($(GREP)) not found in PATH $(PATH)) |
$(error ERROR: GREP command ($(GREP)) not found in PATH $(PATH)) |
endif | endif |
| |
# ====================== | # ====================== |
|
|
# | # |
exists_ECHO: FORCE | exists_ECHO: FORCE |
ifeq ($(ECHO_FULL_PATH),) | ifeq ($(ECHO_FULL_PATH),) |
$(error ECHO command ($(ECHO)) not found in PATH $(PATH)) |
$(error ERROR: ECHO command ($(ECHO)) not found in PATH $(PATH)) |
endif | endif |
| |
| |
|
|
endif | endif |
| |
parm_error: FORCE | parm_error: FORCE |
$(error $(PARM_MSG)) |
$(error ERROR: $(PARM_MSG)) |
| |
| |
| |
|
|
## | ## |
## | ## |
branch_create: exists_minimum exists_BNAME | branch_create: exists_minimum exists_BNAME |
$(CVS) rtag -f TASK-$(BNAME)-root $(MODULE_NAME) |
$(CVS) rtag -f TASK_$(BNAME)-root $(MODULE_NAME) |
$(CVS) rtag -b -r TASK-$(BNAME)-root TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rtag -b -r TASK_$(BNAME)-root TASK_$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-root TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-root TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-root TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-root TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-branch TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-branch TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-branch TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-branch TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
| |
| |
## ===================== | ## ===================== |
|
|
## | ## |
## | ## |
## Process: | ## Process: |
## Rename TASK-[BNAME]-root to TASK-[NEW_BNAME]-root |
## Rename TASK_[BNAME]-root to TASK_[NEW_BNAME]-root |
## Rename TASK-[BNAME]-branch to TASK-[NEW_BNAME]-branch |
## Rename TASK_[BNAME]-branch to TASK_[NEW_BNAME]-branch |
## Rename TASK-[BNAME]-merged_in_to_trunk |
## Rename TASK_[BNAME]-merged_in_to_trunk |
## to TASK-[NEW_BNAME]-merged_in_to_trunk |
## to TASK_[NEW_BNAME]-merged_in_to_trunk |
## Rename TASK-[BNAME]-merged_out_from_trunk |
## Rename TASK_[BNAME]-merged_out_from_trunk |
## to TASK-[NEW_BNAME]-merged_out_from_trunk |
## to TASK_[NEW_BNAME]-merged_out_from_trunk |
## Rename TASK-[BNAME]-merged_in_from_branch |
## Rename TASK_[BNAME]-merged_in_from_branch |
## to TASK-[NEW_BNAME]-merged_in_from_branch |
## to TASK_[NEW_BNAME]-merged_in_from_branch |
## Rename TASK-[BNAME]-merged_out_to_branch |
## Rename TASK_[BNAME]-merged_out_to_branch |
## to TASK-[NEW_BNAME]-merged_out_to_branch |
## to TASK_[NEW_BNAME]-merged_out_to_branch |
## Delete Branch TASK-[BNAME] |
## Delete Branch TASK_[BNAME] |
## | ## |
branch_rename: exists_minimum exists_BNAME exists_NEW_BNAME | branch_rename: exists_minimum exists_BNAME exists_NEW_BNAME |
$(CVS) rtag -r TASK-$(BNAME)-root TASK-$(NEW_BNAME)-root $(MODULE_NAME) |
ifeq ($(BNAME),$(NEW_BNAME)) |
$(CVS) rtag -b -r TASK-$(BNAME)-branch TASK-$(NEW_BNAME)-branch $(MODULE_NAME) |
$(error ERROR: BNAME=NEW_BNAME=($(BNAME)), They must be different.) |
$(CVS) rtag -r TASK-$(BNAME)-merged_in_to_trunk TASK-$(NEW_BNAME)-merged_in_to_trunk $(MODULE_NAME) |
endif |
$(CVS) rtag -r TASK-$(BNAME)-merged_out_from_trunk TASK-$(NEW_BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-root TASK_$(NEW_BNAME)-root $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-merged_in_from_branch TASK-$(NEW_BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -b -r TASK_$(BNAME)-branch TASK_$(NEW_BNAME)-branch $(MODULE_NAME) |
$(CVS) rtag -r TASK-$(BNAME)-merged_out_to_branch TASK-$(NEW_BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -r TASK_$(BNAME)-merged_in_to_trunk TASK_$(NEW_BNAME)-merged_in_to_trunk $(MODULE_NAME) |
|
$(CVS) rtag -r TASK_$(BNAME)-merged_out_from_trunk TASK_$(NEW_BNAME)-merged_out_from_trunk $(MODULE_NAME) |
|
$(CVS) rtag -r TASK_$(BNAME)-merged_in_from_branch TASK_$(NEW_BNAME)-merged_in_from_branch $(MODULE_NAME) |
|
$(CVS) rtag -r TASK_$(BNAME)-merged_out_to_branch TASK_$(NEW_BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME) | $(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME) |
| |
| |
|
|
## | ## |
## | ## |
branch_delete: exists_minimum exists_BNAME | branch_delete: exists_minimum exists_BNAME |
$(CVS) rtag -d TASK-$(BNAME)-root $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-root $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -B -d TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rtag -B -d TASK_$(BNAME)-branch $(MODULE_NAME) |
| |
## ===================== | ## ===================== |
## | ## |
|
|
## directory shall be placed. | ## directory shall be placed. |
## | ## |
branch_co branch_checkout: exists_minimum | branch_co branch_checkout: exists_minimum |
$(CVS) checkout -r TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) checkout -r TASK_$(BNAME)-branch $(MODULE_NAME) |
| |
| |
## ===================== | ## ===================== |
|
|
## Usage: branch_diff_to_root BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] | ## Usage: branch_diff_to_root BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] |
## | ## |
branch_diff_to_root: exists_minimum exists_BNAME | branch_diff_to_root: exists_minimum exists_BNAME |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-root -r TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-root -r TASK_$(BNAME)-branch $(MODULE_NAME) |
| |
## ===================== | ## ===================== |
## | ## |
|
|
## Usage: branch_diff_to_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] | ## Usage: branch_diff_to_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] |
## | ## |
branch_diff_to_trunk: exists_minimum exists_BNAME | branch_diff_to_trunk: exists_minimum exists_BNAME |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-branch $(MODULE_NAME) |
| |
## ===================== | ## ===================== |
## | ## |
|
|
## Usage: branch_diff_unmerged_branch BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] | ## Usage: branch_diff_unmerged_branch BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] |
## | ## |
branch_diff_unmerged_branch: exists_minimum exists_BNAME | branch_diff_unmerged_branch: exists_minimum exists_BNAME |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-merged_in_from_branch -r TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-merged_in_from_branch -r TASK_$(BNAME)-branch $(MODULE_NAME) |
| |
| |
## ===================== | ## ===================== |
|
|
## Usage: branch_diff_unmerged_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] | ## Usage: branch_diff_unmerged_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] |
## | ## |
branch_diff_unmerged_trunk: exists_minimum exists_BNAME | branch_diff_unmerged_trunk: exists_minimum exists_BNAME |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
| |
| |
## ===================== | ## ===================== |
|
|
## Note: Must be executed from the directory where the top pegasus | ## Note: Must be executed from the directory where the top pegasus |
## directory shall be placed when the checkout is performed | ## directory shall be placed when the checkout is performed |
## to instantiate the working copy of the trunk within which | ## to instantiate the working copy of the trunk within which |
## the merge will be performed |
## the merge will be performed. |
|
## |
|
## Note: You can start this process over prior to the commit by |
|
## removing the working copy of the tree and starting over with |
|
## the branch_merge_in command. |
## | ## |
## Process: | ## Process: |
## | ## |
|
|
## - Manually resolve any conflicts in the working copy of the trunk. | ## - Manually resolve any conflicts in the working copy of the trunk. |
## | ## |
## branch_merge_in_commit BNAME=(BRANCH NAME) | ## branch_merge_in_commit BNAME=(BRANCH NAME) |
## - Check in merged changes from the working copy of the trunk into the |
## - Check in merged changes from the working copy of the trunk in. |
## main branch. |
## - executes branch_merge_in_finish |
|
## |
|
## If you chose to do a manual checkin then execute branch_merge_in_finish |
## | ## |
## branch_merge_in_finish BNAME=(BRANCH NAME) | ## branch_merge_in_finish BNAME=(BRANCH NAME) |
## - Move the merged_in_to_trunk tag to the merging_in_to_trunk tag | ## - Move the merged_in_to_trunk tag to the merging_in_to_trunk tag |
## - Move the merged_in_from_branch tag to | ## - Move the merged_in_from_branch tag to |
## the merging_in_from_branch tag | ## the merging_in_from_branch tag |
## - Delete the TASK-$(BNAME)-merging_in_to_trunk tag |
## - Delete the TASK_$(BNAME)-merging_in_to_trunk tag |
## - Delete the TASK-$(BNAME)-merging_in_from_branch tag |
## - Delete the TASK_$(BNAME)-merging_in_from_branch tag |
## | ## |
## | ## |
branch_merge_in: exists_minimum exists_BNAME | branch_merge_in: exists_minimum exists_BNAME |
$(CVS) rtag -F TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -F TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK-$(BNAME)-branch TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-branch TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) checkout -P $(MODULE_NAME) | $(CVS) checkout -P $(MODULE_NAME) |
$(CD) $(MODULE_NAME) | $(CD) $(MODULE_NAME) |
$(CVS) update -P -d -j TASK-$(BNAME)-merged_in_from_branch -j TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) update -P -d -j TASK_$(BNAME)-merged_in_from_branch -j TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) Differences from branch now merged into | @ $(ECHO) Differences from branch now merged into |
@ $(ECHO) the local working copy of the trunk. | @ $(ECHO) the local working copy of the trunk. |
|
|
@ $(ECHO) Now manually: | @ $(ECHO) Now manually: |
@ $(ECHO) 1. Resolve any merge conflicts. | @ $(ECHO) 1. Resolve any merge conflicts. |
@ $(ECHO) 2. Review differences to assure commit integrity. | @ $(ECHO) 2. Review differences to assure commit integrity. |
@ $(ECHO) That is don't check in unintended white space changes |
@ $(ECHO) That is do not check in unintended white space changes, |
@ $(ECHO) test or debug code. | @ $(ECHO) test or debug code. |
@ $(ECHO) 3. Check for aded files and directories and do a cvs add | @ $(ECHO) 3. Check for aded files and directories and do a cvs add |
@ $(ECHO) command for them. | @ $(ECHO) command for them. |
|
|
@ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate | @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate |
@ $(ECHO) branch management tags. | @ $(ECHO) branch management tags. |
@ $(ECHO) | @ $(ECHO) |
|
@ $(ECHO) You can start this process over prior to the commit by removing |
|
@ $(ECHO) the working copy of the tree and then start over with |
|
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_merge_in BNAME=$(BNAME)" |
|
@ $(ECHO) |
@ $(ECHO) | @ $(ECHO) |
| |
| |
|
|
| |
| |
branch_merge_in_finish: exists_minimum exists_BNAME | branch_merge_in_finish: exists_minimum exists_BNAME |
$(CVS) rtag -F -r TASK-$(BNAME)-merging_in_to_trunk TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-merging_in_to_trunk TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK-$(BNAME)-merging_in_from_branch TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-merging_in_from_branch TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME) |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) Branch Management tags have now been updated to reflect the new branch status. | @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status. |
@ $(ECHO) | @ $(ECHO) |
|
|
## to instantiate the working copy of the trunk within which | ## to instantiate the working copy of the trunk within which |
## the merge will be performed | ## the merge will be performed |
## | ## |
|
## Note: You can start this process over prior to the commit by |
|
## removing the working copy of the tree and starting over with |
|
## the branch_merge_out command. |
|
## |
## Process: | ## Process: |
## | ## |
## branch_merge_out BNAME=(BRANCH NAME) | ## branch_merge_out BNAME=(BRANCH NAME) |
|
|
## and merged on the subsequent merge_out. It is safer to | ## and merged on the subsequent merge_out. It is safer to |
## do this than to risk the chance of missing a commit. | ## do this than to risk the chance of missing a commit. |
## - Use update to merge in the trunk changes since last the merge_out. | ## - Use update to merge in the trunk changes since last the merge_out. |
## - Manually resolve any conflicts in the working copy of the trunk. |
## - Manually resolve any conflicts in the working copy of the branch. |
## | ## |
## branch_merge_out_commit BNAME=(BRANCH NAME) | ## branch_merge_out_commit BNAME=(BRANCH NAME) |
## - Check in merged changes from the working copy of the trunk into the |
## - Check in merged changes from the working copy of the branch in. |
## branch. |
## - executes branch_merge_out_finish |
|
## |
|
## If you chose to do a manual checkin then execute branch_merge_out_finish |
## | ## |
## branch_merge_out_finish BNAME=(BRANCH NAME) | ## branch_merge_out_finish BNAME=(BRANCH NAME) |
## - Move the merged_out_from_trunk tag to the merging_out_from_trunk tag | ## - Move the merged_out_from_trunk tag to the merging_out_from_trunk tag |
## - Move the merged_out_to_branch tag to | ## - Move the merged_out_to_branch tag to |
## the merging_out_to_branch tag | ## the merging_out_to_branch tag |
## - Delete the TASK-$(BNAME)-merging_out_from_trunk tag |
## - Delete the TASK_$(BNAME)-merging_out_from_trunk tag |
## - Delete the TASK-$(BNAME)-merging_out_to_branch tag |
## - Delete the TASK_$(BNAME)-merging_out_to_branch tag |
## |
|
## |
|
## | ## |
## | ## |
branch_merge_out: exists_minimum exists_BNAME | branch_merge_out: exists_minimum exists_BNAME |
$(CVS) rtag -F TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -F TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK-$(BNAME)-branch TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-branch TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
$(CVS) checkout -P -r TASK-$(BNAME)-branch $(MODULE_NAME) |
$(CVS) checkout -P -r TASK_$(BNAME)-branch $(MODULE_NAME) |
$(CD) $(MODULE_NAME) | $(CD) $(MODULE_NAME) |
$(CVS) update -d -j TASK-$(BNAME)-merged_out_from_trunk -j TASK-$(BNAME)-merging_out_from_trunk |
$(CVS) update -d -j TASK_$(BNAME)-merged_out_from_trunk -j TASK_$(BNAME)-merging_out_from_trunk |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) Differences from trunk now merged into | @ $(ECHO) Differences from trunk now merged into |
@ $(ECHO) the local working copy of the branch. | @ $(ECHO) the local working copy of the branch. |
|
|
@ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate | @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate |
@ $(ECHO) branch management tags. | @ $(ECHO) branch management tags. |
@ $(ECHO) | @ $(ECHO) |
|
@ $(ECHO) You can start this process over prior to the commit by removing |
|
@ $(ECHO) the working copy of the tree and then start over with |
|
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_merge_out BNAME=$(BNAME)" |
|
@ $(ECHO) |
@ $(ECHO) | @ $(ECHO) |
| |
branch_merge_out_ci branch_merge_out_commit: exists_minimum exists_BNAME | branch_merge_out_ci branch_merge_out_commit: exists_minimum exists_BNAME |
|
|
$(MAKE) -f $(FILE) branch_merge_out_finish BNAME=$(BNAME) | $(MAKE) -f $(FILE) branch_merge_out_finish BNAME=$(BNAME) |
| |
branch_merge_out_finish: exists_minimum exists_BNAME | branch_merge_out_finish: exists_minimum exists_BNAME |
$(CVS) rtag -F -r TASK-$(BNAME)-merging_out_from_trunk TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-merging_out_from_trunk TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -F -r TASK-$(BNAME)-merging_out_to_branch TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -F -r TASK_$(BNAME)-merging_out_to_branch TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME) |
$(CVS) rtag -d TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
$(CVS) rtag -d TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME) |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) Branch Management tags have now been updated to reflect the new branch status. | @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status. |
@ $(ECHO) | @ $(ECHO) |
|
|
## Note: Must be executed from the directory where the top pegasus | ## Note: Must be executed from the directory where the top pegasus |
## directory shall be placed when the checkout is performed | ## directory shall be placed when the checkout is performed |
## to instantiate the working copy of the trunk within which | ## to instantiate the working copy of the trunk within which |
## the merge will be performed |
## the merge will be performed. |
|
## |
|
## Note: You can start this process over prior to the commit by |
|
## removing the working copy of the tree and doing a |
|
## "branch_delete (BNAME)_new" and then starting over with |
|
## the branch_migrate command. |
## | ## |
## Process: | ## Process: |
## | ## |
|
|
branch_migrate: exists_minimum exists_BNAME | branch_migrate: exists_minimum exists_BNAME |
$(MAKE) -f $(FILE) branch_diff_unmerged_branch BNAME=$(BNAME) 1>branch_migrate_diffs | $(MAKE) -f $(FILE) branch_diff_unmerged_branch BNAME=$(BNAME) 1>branch_migrate_diffs |
$(MAKE) -f $(FILE) branch_create BNAME=$(BNAME)_new | $(MAKE) -f $(FILE) branch_create BNAME=$(BNAME)_new |
$(CVS) checkout -P -r TASK-$(BNAME)_new-branch $(MODULE_NAME) |
$(CVS) checkout -P -r TASK_$(BNAME)_new-branch $(MODULE_NAME) |
$(PATCH) -b -p0 --global-reject-file=global-reject-patch-file < branch_migrate_diffs | $(PATCH) -b -p0 --global-reject-file=global-reject-patch-file < branch_migrate_diffs |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) | @ $(ECHO) |
|
|
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate_ci BNAME=$(BNAME)" | @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate_ci BNAME=$(BNAME)" |
@ $(ECHO) within the $(MODULE_NAME) directory. | @ $(ECHO) within the $(MODULE_NAME) directory. |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) If you chose to do a manual commit then after the commit |
@ $(ECHO) After the commit is complete do either one of the following |
@ $(ECHO) is complete then do a |
@ $(ECHO) dependent on wheter you want the previous branch deleted or saved. |
|
@ $(ECHO) |
|
@ $(ECHO) This will delete the previous branch and move the branch management. |
|
@ $(ECHO) |
@ $(ECHO) "$(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)" | @ $(ECHO) "$(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)" |
@ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate | @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate |
@ $(ECHO) branch management tags. | @ $(ECHO) branch management tags. |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) If you wish to start this process over then do a |
@ $(ECHO) This will rename the branch just migrated to keeping the old branch. |
|
@ $(ECHO) |
|
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=$(BNAME)_(VER)" |
|
@ $(ECHO) |
|
@ $(ECHO) You can start this process over prior to the commit by removing |
|
@ $(ECHO) the working copy of the tree and then deleting the new branch this |
|
@ $(ECHO) process created with |
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_delete BNAME=$(BNAME)_new" | @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_delete BNAME=$(BNAME)_new" |
@ $(ECHO) to remove the new branch that was created as the migration |
@ $(ECHO) and then start over with |
@ $(ECHO) target. |
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate BNAME=$(BNAME)" |
|
@ $(ECHO) |
@ $(ECHO) | @ $(ECHO) |
| |
branch_migrate_ci branch_migrate_commit: exists_minimum exists_BNAME | branch_migrate_ci branch_migrate_commit: exists_minimum exists_BNAME |
|
|
$(MAKE) -f $(FILE) branch_diff_to_root BNAME=$(BNAME)_new > diff_to_root_$(BNAME)_new | $(MAKE) -f $(FILE) branch_diff_to_root BNAME=$(BNAME)_new > diff_to_root_$(BNAME)_new |
@ $(ECHO) Do a | @ $(ECHO) Do a |
@ $(ECHO) " diff diff_to_root_$(BNAME) diff_to_root_$(BNAME)_new" | @ $(ECHO) " diff diff_to_root_$(BNAME) diff_to_root_$(BNAME)_new" |
@ $(ECHO) to verify TASK-$(BNAME)_new has all the changes. |
@ $(ECHO) to verify TASK_$(BNAME)_new has all the changes. |
@ $(ECHO) | @ $(ECHO) |
@ $(ECHO) Then do a | @ $(ECHO) Then do a |
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)" | @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)" |
@ $(ECHO) which will remove TASK-$(BNAME), the old branch, and then rename TASK-$(BNAME)_new to TASK-$(BNAME) |
@ $(ECHO) which will remove TASK_$(BNAME), the old branch, and then rename TASK_$(BNAME)_new to TASK_$(BNAME) |
@ $(ECHO) Alternatively you can keep the old branch around for a while and just | @ $(ECHO) Alternatively you can keep the old branch around for a while and just |
@ $(ECHO) rename the new branch by doing a | @ $(ECHO) rename the new branch by doing a |
@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=($BNAME)_X" | @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=($BNAME)_X" |