pegasus/mak/TaskMakefile - diff

Return to TaskMakefile CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/TaskMakefile between version 1.2 and 1.3

version 1.2, 2006/03/08 23:53:57

version 1.3, 2006/03/09 18:33:18

Line 106

## branch_diff_to_root

## bracnh_diff_unmerged_branch

## branch_diff_unmerged_trunk

## branch_diff_to_trunk

## branch_diff_to_trund

## branch_merge_in

## branch_merge_out

## branch_migrate

Line 665

## Note: Must be executed from the directory where the top pegasus

## directory shall be placed when the checkout is performed

## 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:

Line 684

Line 688

## - Manually resolve any conflicts in the working copy of the trunk.

## 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)

## - Move the merged_in_to_trunk tag to the merging_in_to_trunk tag

Line 723

Line 729

@ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate

@ $(ECHO) branch management tags.

@ $(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)

Line 757

Line 767

## to instantiate the working copy of the trunk within which

## 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:

## branch_merge_out BNAME=(BRANCH NAME)

Line 771

Line 785

## and merged on the subsequent merge_out. It is safer to

## do this than to risk the chance of missing a commit.

## - 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)

## - 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)

## - Move the merged_out_from_trunk tag to the merging_out_from_trunk tag

Line 785

Line 801

## - Delete the TASK-$(BNAME)-merging_out_to_branch tag

branch_merge_out: exists_minimum exists_BNAME

$(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)

Line 812

Line 826

@ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate

@ $(ECHO) branch management tags.

@ $(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)

branch_merge_out_ci branch_merge_out_commit: exists_minimum exists_BNAME

Line 844

Line 862

## Note: Must be executed from the directory where the top pegasus

## directory shall be placed when the checkout is performed

## 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:

Line 888

Line 911

@ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_migrate_ci BNAME=$(BNAME)"

@ $(ECHO) within the $(MODULE_NAME) directory.

@ $(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) within the $(MODULE_NAME) directory to reset the appropriate

@ $(ECHO) branch management tags.

@ $(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) 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)

branch_migrate_ci branch_migrate_commit: exists_minimum exists_BNAME

Legend:

Removed from v.1.2
changed lines
	Added in v.1.3

No CVS admin address has been configured