set branches based on "branch" points in the control file

diff --git a/do_merge b/do_merge
index 829340135074150ea93ccb6a35fd7993fe1a6dfb..5aa414a42113f6dfa15e38497aeb07b5437866df 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -91,13 +91,18 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }')
 
 need_build=false
 
 for h in $heads; do
        tree=${h%%/*}
 
+       [ "$tree" = "branch" ] && {
+               git branch -f "${h#branch/}"
+               continue
+       }
+
        [ -n "$start_from" ] && {
                if [ "$tree" = "$start_from" ]; then
                        start_from=""

diff --git a/make_tree_file b/make_tree_file
index 7e5d682cd4e58b662ad00e92ac55742de0bdbfca..c144ccc59980e77fe6505b767300a1aa06bc0c6f 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -30,6 +30,7 @@ mkdir Next
        IFS='   '
        grep -v '^#' $CTRL_FILE |
                while read email type name url ref build; do
+                       [ "$type" = "branch" ] && continue
                        tab="\t"
                        [ ${#name} -le 8 ] && tab="\t\t"
                        [ "$type" = "git" ] && url="$url#${ref##*:}"