From 460f310bcce2a5004d59eb7ae4b31a05c724e5ff Mon Sep 17 00:00:00 2001 From: Sergio Ahumada <sergio.ahumada@digia.com> Date: Tue, 4 Dec 2012 11:26:08 +0100 Subject: [PATCH] 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: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> --- sync.profile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sync.profile b/sync.profile index d65c740a66..bddfd0f7f3 100644 --- a/sync.profile +++ b/sync.profile @@ -17,7 +17,7 @@ # - 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", - "qtjsbackend" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", ); -- GitLab