Merge lp:~gary/launchpad/fix-db-devel-sourcecode into lp:launchpad

Proposed by Gary Poster
Status: Merged
Approved by: Gavin Panella
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~gary/launchpad/fix-db-devel-sourcecode
Merge into: lp:launchpad
Diff against target: 10 lines (+2/-0)
1 file modified
utilities/sourcedeps.conf (+2/-0)
To merge this branch: bzr merge lp:~gary/launchpad/fix-db-devel-sourcecode
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+17674@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This tries to quickly work around the fact that our scripts do not handle different sourcecode.conf files, by syncing sourcecode.conf in devel and db-devel.

The right fixes, for later, include the following:

- Switch as much as possible to buildout from sourcecode branches, because buildout handles this situation just fine.
- Make ec2 and buildbot honor the revisions from the currently tested branch (see https://launchpad.net/bugs/508025 and https://launchpad.net/bugs/509759).
- Consider making db-devel and devel have their own sourcecode trees in development environments. It would still break in some cases, but would be better than what we have now.

Pre-impl with flacoste.

Gary

Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.conf'
2--- utilities/sourcedeps.conf 2010-01-15 00:08:36 +0000
3+++ utilities/sourcedeps.conf 2010-01-19 17:56:18 +0000
4@@ -1,4 +1,6 @@
5+bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=63
6 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=249
7+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
8 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47
9 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2706
10 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=430