code_branch_1or2

Advantage

ARCServe Hotfix

Scenario Two:

1. Minimize the range of code changing2.The frequency of making a hotfix could be very low.

Disadvantage

ARCServe

Scenario One:

1.Small effort to manage hotfix code branch since all of the code-changing are integrated into the same code branch2.Small effort for DEV to merge code in the future.

1.Applying new hotfix could introduce new bugs2.The frequency of making a hotfix could be higher than before.3. Big effort for QA to do sanity test 4.Take longer time to publish a hotfix

L2 fix VS Hotfix：

including all of the Common hotfix and L2 fix

Common hotfix for all of the UDP customer basing on UDP GM build

ARCServe L2

1.It's difficult to decide whether to apply the common hotfix to the L2 customer UDP environment or not when the conflicts occur because the base code is not the same.2.A big effort for DEV to merge code in the future. 3. Big effort for QA to do sanity test