Context Navigation

Changes between Version 3 and Version 4 of Ticket #16944

-              v3
+              v4
 ###
-REBASE_CONF=$(mktemp)
+(
   git log --pretty="format:%at %H %s" remotes/svn_josmtrunk
   git log --pretty="format:%at %H %s" svn_jmapviewer_rewrite
-) | sort -n > "${REBASE_CONF}"
-JOSM_EPOCH=$(head -n 1 ${REBASE_CONF} | cut -d ' ' -f1 )
+(
-  #git log --ancestry-path  --pretty="format:%ct %H %s" \
-  #   $(git log --reverse --oneline --no-abbrev-commit svn_commons_compress_rewrite |
-  #   head -n 1 | cut -d ' ' -f 1)..svn_commons_compress_rewrite # we are not rebasing this, to preserve commit timestamps which we use here
   git log --first-parent --pretty="format:%at %H %s" svn_commons_compress_clean
   git log --pretty="format:%at %H %s" svn_commons_jcstrunk_clean
   git log --pretty="format:%at %H %s" svn_commons_loggingtrunk_clean
+  # could use it:
+  # | awk -F ' ' "\$1 > ${JOSM_EPOCH} {print \$1 \" \" \$2} {}" >> "${REBASE_CONF}"
+  # to keep only history after fist JOSM commit, but we would need to squash all the previous history into one commit
+) >> "${REBASE_CONF}"
+) | sort -n | cut -d ' ' -f2 | sed -e 's/^/p /' > ../rebase_config
-sort -n ${REBASE_CONF} | cut -d ' ' -f2 | sed -e 's/^/p /' > ../rebase_config
-rm ${REBASE_CONF}
 git config merge.renamelimit 5000
 git checkout master
 …
 git reflog expire --expire-unreachable=now --all
 git gc --prune=now
 }}}