PlasticSCM – Working with branch per task

If you are a single developer, then you just want to create a branch for working (look how the home icon is changed to the new branch when selecting the check on the bottom):

Create a new branch:

plasticscm_en_work_09_creating_new_branch.png


Fill in the name and description, and select the bottom checkbox:

plasticscm_en_work_10_creating_new_branch_name.png


The new branch was created:

plasticscm_en_work_11_creating_new_branch_done.png


Now you can make your changes, the Close button is preexistent and the new field is FirstName (label and textbox):

plasticscm_en_work_12_modify_form1.png


Go to Pending Changes view, and refresh using the semi-circular arrow on the left:

plasticscm_en_work_13_PendingChanges_form1.png


Regenerate text versions for Pending Changed files:

plasticscm_en_work_14_PendingChanges_form1_regenerate_text.png


And refresh the Pending Changes view, which now shows the generated text file:

plasticscm_en_work_15_PendingChanges_form1_refresh.png


Then finally checkin and open Branch Explorer:

plasticscm_en_work_16_BranchExplorer_form1.png


Now you want to add this functionality to the next release v2_0, so let’s create a new branch for the release v2_0 from the last on production:

plasticscm_en_work_17_New_Branch_Release_v2_0.png


And now merge your work branch (pay attention at where is the home icon):

plasticscm_en_work_18_Merge_Branch_into_Release_v2_0.png


You can see a new tab with a new merge view with the items about to merge:

plasticscm_en_work_19_Merge_View.png


Then click the “process all merges” button at the top, and because this merge is automatic (nobody else has made changes) you can close this view using the (x) on the right of the tab:

plasticscm_en_work_20_Merge_View_Finished.png


On the Branch Explorer view you can see a dotted green line indicating that the merge is not finished yet:

plasticscm_en_work_21_Merge_View_Pending.png


Because you must verify and confirm the changes (or revert them) in the Pending Changes view:

plasticscm_en_work_22_PendingChanges_view.png


Now you confirm the changes and get back to Branch Explorer view:

plasticscm_en_work_23_BranchExplorer_view.png



Congratulations! Your changes are on the release!
 

 

Index of contents:

Using FoxBin2Prg with PlasticSCM
PlasticSCM - Download and configuration
PlasticSCM – Adding an existing VFP project
PlasticSCM – Working with branch per task
PlasticSCM – Working with branches with a second developer on same task
PlasticSCM - Desintegrate a task from the release
PlasticSCM - Synchronizing with a Git Repository
PlasticSCM – What’s next

Last edited Aug 18, 2014 at 4:02 PM by fdbozzo, version 8

Comments

No comments yet.