diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 23:53:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 15:02:15 +0100 |
| commit | 247ba8153251422622f89246a0af316dcde486fb (patch) | |
| tree | 05a84e58f88771ff60a06d46b612ae4526b0c5c4 | |
| parent | b8e28c0544833938a69dca52793e7da8e7efdbb6 (diff) | |
| download | qttranslations-247ba8153251422622f89246a0af316dcde486fb.tar.gz | |
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: I38e3aac93439845c2a42ac87e3f46343075ba7dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | sync.profile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sync.profile b/sync.profile index c6e2253..664e88a 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/dev", + "qtscript" => "refs/heads/dev", + "qtsvg" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", + "qtactiveqt" => "refs/heads/dev", + "qttools" => "refs/heads/dev", ); |