From 3a279e855d99c569e0d8c2434f4f99f50cbc689e Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Dec 2012 11:34:21 +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: I8eda77404c916d7cd5416eb28b0a54c68161f40a Reviewed-by: Janne Anttila --- sync.profile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sync.profile') diff --git a/sync.profile b/sync.profile index c6e2253..955937a 100644 --- a/sync.profile +++ b/sync.profile @@ -5,12 +5,12 @@ # - 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", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", - "qtactiveqt" => "refs/heads/master", - "qttools" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtscript" => "refs/heads/stable", + "qtsvg" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", + "qtactiveqt" => "refs/heads/stable", + "qttools" => "refs/heads/stable", ); -- cgit v1.2.1