Changeset 639 for CMT/v1r25-branch
- Timestamp:
- Jun 6, 2013, 3:21:22 PM (11 years ago)
- Location:
- CMT/v1r25-branch
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/v1r25-branch/ChangeLog
- Property svn:mergeinfo changed
/CMT/HEAD/ChangeLog merged: 629
r638 r639 1 2013-01-25 <rybkin@lal.in2p3.fr> 500 2 3 * source/cmt_project.cxx: In class Project functions set_strategy and 4 update_strategy, update strategy for project(s) without parent and children 5 1 6 2013-01-11 <rybkin@lal.in2p3.fr> 499 2 7 - Property svn:mergeinfo changed
-
CMT/v1r25-branch/source/cmt_project.cxx
-
Property
svn:mergeinfo
set to
/CMT/HEAD/source/cmt_project.cxx merged eligible
r610 r639 2958 2958 project->update_strategy (definition, b_value); 2959 2959 } 2960 2961 const ProjectPtrVector& OrderedProjects = Project::ordered_projects (); 2962 for (int i = OrderedProjects.size () - 2; i >= 0; i--) 2963 { 2964 if (this != OrderedProjects[i + 1]) continue; 2965 if (!OrderedProjects[i]->has_parents () && 2966 OrderedProjects[i]->get_children_size () == 0) 2967 { 2968 OrderedProjects[i]->update_strategy (definition, b_value); 2969 } 2970 break; 2971 } 2960 2972 } 2961 2973 … … 3011 3023 3012 3024 project->update_strategy (definition, b_value); 3025 } 3026 3027 const ProjectPtrVector& OrderedProjects = Project::ordered_projects (); 3028 for (int i = OrderedProjects.size () - 2; i >= 0; i--) 3029 { 3030 if (this != OrderedProjects[i + 1]) continue; 3031 if (!OrderedProjects[i]->has_parents () && 3032 OrderedProjects[i]->get_children_size () == 0) 3033 { 3034 OrderedProjects[i]->update_strategy (definition, b_value); 3035 } 3036 break; 3013 3037 } 3014 3038 } -
Property
svn:mergeinfo
set to
Note: See TracChangeset
for help on using the changeset viewer.