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/Standard/Standard_Version.hxx

@@ -34,7 +34,7 @@
 
 // Primary definitions
 #define OCC_VERSION_MAJOR         7
-#define OCC_VERSION_MINOR         7
+#define OCC_VERSION_MINOR         8
 #define OCC_VERSION_MAINTENANCE   0
 
 //! This macro must be commented in official release, and set to non-empty 
@@ -42,12 +42,12 @@
 //! - "dev" for development version between releases
 //! - "beta..." or "rc..." for beta releases or release candidates
 //! - "project..." for version containing project-specific fixes
-//#define OCC_VERSION_DEVELOPMENT   "dev"
+#define OCC_VERSION_DEVELOPMENT   "dev"
 
 // Derived (manually): version as real and string (major.minor)
-#define OCC_VERSION               7.7
-#define OCC_VERSION_STRING       "7.7"
-#define OCC_VERSION_COMPLETE     "7.7.0"
+#define OCC_VERSION               7.8
+#define OCC_VERSION_STRING       "7.8"
+#define OCC_VERSION_COMPLETE     "7.8.0"
 
 //! Derived: extended version as string ("major.minor.maintenance.dev")
 #ifdef OCC_VERSION_DEVELOPMENT

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