Update

get.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+problem_file=upgrade.bat
+
+list="master integration"
+echo "Getting commit hash"
+for name in $list ; do
+    echo $name
+    export shorthash_$name=$(git rev-parse --short $name)
+    echo shorthash_$name=$(eval echo "\$shorthash_${name}")
+done
+
+echo "Getting list of commits between master and integration"
+list=$(git rev-list --ancestry-path ${shorthash_master}..${shorthash_integration})
+
+echo "Getting commit whose hash matches the hash of commit with problematic file"
+for hash in $list ; do    
+    list_changed_files=$(git diff-tree --no-commit-id --name-only -r $hash | sed 's/\// /g' | awk '{ print $NF }')
+    for changed_file in $list_changed_files; do
+        if [ "$problem_file" == "$changed_file" ] ; then
+            echo Reverting: 
+            echo $(git log -1 --format=oneline $hash)
+            # git revert $hash
+            hash=$(echo $hash | head -c 10)
+            echo $hash
+            git rebase --onto $hash^ $hash
+        fi
+    done
+done

src/Adaptor3d/Adaptor3d_Curve.cxx

@@ -13,7 +13,7 @@
 //
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
-
+// branch2
 #include <Adaptor3d_Curve.hxx>
 
 #include <Geom_BezierCurve.hxx>

src/IntTools/IntTools_BeanFaceIntersector.cxx

@@ -1154,6 +1154,7 @@ void IntTools_BeanFaceIntersector::ComputeRangeFromStartPoint(const Standard_Boo
 
   Standard_Boolean isboundaryindex = Standard_False;
   Standard_Boolean isvalidindex = Standard_True;
+  
   while((aDelta >= aMinDelta) && (loopcounter <= 10)) {
     Standard_Boolean pointfound = Standard_False;
 
@@ -1181,11 +1182,13 @@ void IntTools_BeanFaceIntersector::ComputeRangeFromStartPoint(const Standard_Boo
         break;
     }
     else {
-      aDeltaRestrictor *= 0.5;
+      aDeltaRestrictor = aDelta;
     }
     
-    // Increase step if point was found, decrease otherwise
-    aDelta *= (pointfound ? 2. : 0.5);
+    // if point found decide to increase aDelta using derivative of distance function
+    //
+    
+    aDelta = (pointfound) ? (aDelta * 2.) : (aDelta * 0.5);
     aDelta = (aDelta < aDeltaRestrictor) ? aDelta : aDeltaRestrictor;
 
     aCurPar = (ToIncreaseParameter) ? (aPrevPar + aDelta) : (aPrevPar - aDelta);
@@ -1194,7 +1197,7 @@ void IntTools_BeanFaceIntersector::ComputeRangeFromStartPoint(const Standard_Boo
     // prevent infinite loop when (aPrevPar +/- aDelta) == aPrevPar == 0.
     //
     
-    if (Abs (aCurPar - aPrevPar) < myCurveResolution) 
+    if( aCurPar == aPrevPar )
       break;
     
     BoundaryCondition  = (ToIncreaseParameter) ? (aCurPar > aCurrentRange.Last()) : (aCurPar < aCurrentRange.First());

tests/perf/modalg/bug29144

@@ -1,27 +0,0 @@
-puts "========"
-puts "0029144: Modeling Algorithms - BOP PaveFiller hangs in some case"
-puts "========"
-puts ""
-
-puts "TODO OCC29145 ALL : Faulty shapes in variables faulty_1 to faulty_"
-
-bclearobjects;
-bcleartools;
-
-restore [locate_data_file bug29093_hung3.brep] a
-explode a So
-baddobjects a_7
-baddtools a_11
-
-dchrono cr restart
-
-bfillds
-bbuild result
-
-dchrono cr stop counter bbuild
-
-checkshape result
-checkprops result -s 1313890 -v 46778600
-checknbshapes result -vertex 9 -edge 20 -wire 12 -face 12 -shell 3 -solid 3 
-
-checkview -display result -2d -path ${imagedir}/${test_image}.png

upgrade.bat

@@ -1,5 +1,5 @@
 @echo off
-
+rem test1
 rem Helper script to run procedure of automatic upgrade of application code
 rem on newer version of OCCT on Windows.
 rem Running it requires that Tcl should be in the PATH