X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fgit-hg-sub-import;fp=scripts%2Fgit-hg-sub-import;h=64b10357f71fb5c13ba49ba33f55bc0cf173449c;hb=709ea4d8cc259f539f04830fabb7fd481d04cc7b;hp=ecd7757ac0381573e98c79b354e3895190e5de94;hpb=a3d197ba5982637e448f1f89201bca4d99e01602;p=hvutilities.git

diff --git a/scripts/git-hg-sub-import b/scripts/git-hg-sub-import
index ecd7757..64b1035 100755
--- a/scripts/git-hg-sub-import
+++ b/scripts/git-hg-sub-import
@@ -50,8 +50,12 @@ subrepo_find_branch() {
         branch=default
     fi
 
+    num=$(hg log --branch "${branch}" --template '{node}\n' | \
+        grep -n ${rev} | awk -F ':' '{print $1}')
+
     if [ -n "${debug}" ]; then
         echo "  branch: ${branch}"
+        echo "  num:    ${num}"
     fi
 
     popd
@@ -118,9 +122,13 @@ while read sub; do
                 cd "${dest}"
                 git checkout "branches/${branch}"
 
-                # This does not work: the SHA from hg and git
-                # are not the same...
-                #git reset --hard ${rev}
+                # Adjusting git tree to specific commit specified in
+                # .hgsubstate:
+                # The SHA from hg and git are not the same, therefore, we must
+                # find the commit sequence in hg and map this
+                # to a hash in git using the ${num} variable:
+                git_rev=$(git log --oneline | sed -n "${num}p" | awk '{print $1}')
+                git reset --hard ${git_rev}
 
                 cd ..
             fi