diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 21:55:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 13:52:32 +0100 |
| commit | f685e3463b32bfd05a7b2574b4699e5f42f02f96 (patch) | |
| tree | 426ac35ab5b121a285b1e8e6d5a63bf3eb4ee4db /sync.profile | |
| parent | 0f5eec1e36ec1b61e0ff93b62245fb9377a26d6d (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
andi/or decide how to handle possible conflicts.
This is good enough for the time being.
Change-Id: Ifeae1b5de37e7bcaefbfa9038e50f3667645eca2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile index d65c740a66..61d25bafa5 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/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", ); |