From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Sun, 8 Mar 2015 12:54:40 +0000 (+0000)
Subject: Branches: Rename "incoming" branch to "production"
X-Git-Tag: wip.libvirt-v3-base~249
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=310c5b58d6ac2588f440a9c3eedc7358e9bc7a19;p=people%2Fliuw%2Fosstest.git

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 aae4f17..1987b73 100644
--- 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 7b7f50e..0b4739b 100755
--- 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 01089f3..c141464 100755
--- 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 cbd1c74..7a93a62 100755
--- 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