Rebuild patches after we continue from a paper edit.

2016-04-02 18:34:27 -05:00
parent 526469fd23
commit aeea23a135
11 changed files with 44 additions and 35 deletions
--- a/scripts/upstreamMerge.sh
+++ b/scripts/upstreamMerge.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"

 function update {