From ccc22dc8b13c822e2f431a167a700a270995fd8f Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Dec 2012 11:27:29 +0100 Subject: sync.profile: Point dependencies to 'refs/heads/stable' We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I68e7989069e49ac3e2a4fdf673506431dfcd099d Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila --- sync.profile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sync.profile') diff --git a/sync.profile b/sync.profile index ccb39b7b..6d3be16a 100644 --- a/sync.profile +++ b/sync.profile @@ -5,11 +5,11 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/master", - "qtscript" => "refs/heads/master", - "qtsvg" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", - "qttools" => "refs/heads/master", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtscript" => "refs/heads/stable", + "qtsvg" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qttools" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", ); -- cgit v1.2.1