diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-04 11:27:29 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 12:46:47 +0100 |
commit | ccc22dc8b13c822e2f431a167a700a270995fd8f (patch) | |
tree | c32d868bb6b8c97e8f0dc969473d2beab0131dc5 /sync.profile | |
parent | 52cc2d8ba4966ee337b7aa8cac7f55554273d144 (diff) | |
download | qtdoc-ccc22dc8b13c822e2f431a167a700a270995fd8f.tar.gz |
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 14 |
1 files changed, 7 insertions, 7 deletions
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", ); |