From c0581ff10fcdef29fd25c3f6d0cf0235243176d5 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Dec 2012 11:33:36 +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: I25e8206d8df8f69ffc5c282487e5d8af22e6b690 Reviewed-by: Janne Anttila --- sync.profile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sync.profile') diff --git a/sync.profile b/sync.profile index a7c0427fc..5b4d9eea4 100644 --- a/sync.profile +++ b/sync.profile @@ -16,10 +16,10 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", - "qtactiveqt" => "refs/heads/master", - "qtwebkit" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", + "qtactiveqt" => "refs/heads/stable", + "qtwebkit" => "refs/heads/stable", ); -- cgit v1.2.1