Branches: Rename "incoming" branch to "production"

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/README.dev b/README.dev
index aae4f17b44af02cc647f42d54095b477ba81e6fa..1987b736ab2f056b95a94979106ac6218c506582 100644 (file)
--- a/README.dev
+++ b/README.dev
@@ -113,7 +113,7 @@ Creating a new branch
   to production pretest branch), rewind so that osstest can fast
   forward it to the actual production version.  Ie in bisects and
   branches for-$branch.git,
-     git fetch origin incoming
+     git fetch origin production
      git reset --hard FETCH_HEAD
 
 $ Add to BRANCHES setting in cr-for-branches

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 7b7f50eaceb926cf3b53535dafa200b312ab4799..0b4739b5eb14bab4ffc23e0d67fed1516c6acdf6 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -99,7 +99,7 @@ ovmf)
        ;;
 osstest)
        if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
-           git fetch -f $HOME/testing.git incoming:ap-fetch
+           git fetch -f $HOME/testing.git production:ap-fetch
             git rev-parse ap-fetch^0
        else
            git rev-parse HEAD^0

diff --git a/ap-push b/ap-push
index 01089f363bc94cf10d7d65f88137dc3100deb4a7..c1414640bd463543486fa31d55379a80bb814c25 100755 (executable)
--- a/ap-push
+++ b/ap-push
@@ -98,7 +98,7 @@ ovmf)
        git push $TREE_OVMF $revision:refs/heads/xen-tested-master
        ;;
 osstest)
-       git push $HOME/testing.git $revision:incoming
+       git push $HOME/testing.git $revision:production
        git push $XENBITS:/home/xen/git/osstest.git $revision:master
        ;;
 *)

diff --git a/cr-for-branches b/cr-for-branches
index cbd1c742cffc35339158feb1f2a2e56624c40d35..7a93a6211947e914f15e3069caf98f618727aef7 100755 (executable)
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -43,7 +43,7 @@ with-lock-ex $fetchwlem data-tree-lock bash -ec '
        exec >>$LOGFILE
        date
         printf "%s\n" "$FOR_LOGFILE"
-       git pull . incoming:master 2>&1 ||:
+       git pull . production:master 2>&1 ||:
        git checkout HEAD
 '
 
@@ -94,7 +94,7 @@ for branch in $BRANCHES; do
                find tmp -type f -mtime +60 -print0 | xargs -0r rm -f --
 
                git fetch $OSSTEST_TEST_PULLFROM master:incoming 2>&1 ||:
-               git fetch $OSSTEST_TEST_PULLFROM incoming:incoming 2>&1 ||:
+               git fetch $OSSTEST_TEST_PULLFROM production:incoming 2>&1 ||:
                git pull --no-commit . incoming:master 2>&1 ||:
                git checkout HEAD