Subversion Repositories DevTools

Rev

Rev 5081 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5081 Rev 5177
Line 481... Line 481...
481 
    Dim rc
 481 
    Dim rc
482 
 
 482 
 
483 
    ' Business Rules restricting the use of the merge feature...
 483 
    ' Business Rules restricting the use of the merge feature...
484 
    ' Bypass merge if the destination release is in closed or archive mode, or if user does not have
 484 
    ' Bypass merge if the destination release is in closed or archive mode, or if user does not have
485 
    ' merge permissions
 485 
    ' merge permissions
- 
 
 486 
    If    releaseMode <> enumDB_RELEASE_IN_CLOSED_MODE  _
- 
 
 487 
      AND releaseMode <> enumDB_RELEASE_IN_PRESERVE_MODE _
486 
    If releaseMode <> enumDB_RELEASE_IN_CLOSED_MODE  AND releaseMode <> enumDB_RELEASE_IN_ARCHIVE_MODE _
 488 
      AND releaseMode <> enumDB_RELEASE_IN_ARCHIVE_MODE _
487 
    AND (canActionControlInProject("MergeRelease")) THEN
 489 
      AND (canActionControlInProject("MergeRelease")) THEN
488 
 
 490 
 
489 
        Set dAddPkgList = CreateObject("Scripting.Dictionary")
 491 
        Set dAddPkgList = CreateObject("Scripting.Dictionary")
490 
        Set dRemovePkgList = CreateObject("Scripting.Dictionary")
 492 
        Set dRemovePkgList = CreateObject("Scripting.Dictionary")
491 
 
 493 
 
492 
        '--- Get Add Packages ---
 494 
        '--- Get Add Packages ---