diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 22:22:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-14 15:21:34 +0100 |
| commit | c2736c3a629d944818c44db9ad69beffb872bdd5 (patch) | |
| tree | 85c93af3072af2aa00dd7473d93a6b6225e6e81a | |
| parent | 6a6c9ca37c0cf9ee8e1156860db7d32508a9dc5a (diff) | |
sync.profile: Point dependencies to 'refs/heads/dev'
We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.
This is good enough for the time being.
Change-Id: I9f3c9977b162b82611e48cd304cfcc316fed95ad
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | sync.profile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sync.profile b/sync.profile index da5324322..abccf5625 100644 --- a/sync.profile +++ b/sync.profile @@ -20,8 +20,8 @@ # - 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", + "qtbase" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", ); |