diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-13 00:00:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 12:01:17 +0100 |
| commit | 4c8f2c3b376186a2620bd3b879f4e5970239ac2f (patch) | |
| tree | 7e4fc43c6e23225ff0d154c2ce5f23c2a0d3198f | |
| parent | d967ab094b7329ddfd5b3f6f1a42b6d5282dcf77 (diff) | |
| download | qtwebkit-examples-4c8f2c3b376186a2620bd3b879f4e5970239ac2f.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: If62f887a8e561832d6cf5208599221ece7760c02
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | sync.profile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sync.profile b/sync.profile index 5085139..b72775f 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", - "qtwebkit" => "refs/heads/master", - "qtscript" => "refs/heads/master", - "qtsvg" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", - "qttools" => "refs/heads/master", + "qtbase" => "refs/heads/dev", + "qtwebkit" => "refs/heads/dev", + "qtscript" => "refs/heads/dev", + "qtsvg" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", + "qttools" => "refs/heads/dev", ); |