Merge lp://staging/~intellectronica/launchpad/revert-production-devel-mess into lp://staging/launchpad/db-devel
Proposed by
Eleanor Berger
| Status: | Merged |
|---|---|
| Approved by: | Björn Tillenius |
| Approved revision: | 9089 |
| Merge reported by: | Björn Tillenius |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~intellectronica/launchpad/revert-production-devel-mess |
| Merge into: | lp://staging/launchpad/db-devel |
| Diff against target: |
292 lines (+155/-23) (has conflicts) 6 files modified
.bzrignore (+4/-0) lib/canonical/launchpad/pagetests/standalone/xx-offsite-form-post.txt (+22/-6) lib/canonical/launchpad/testing/browser.py (+20/-0) lib/canonical/launchpad/webapp/publication.py (+26/-5) lib/lp/archiveuploader/dscfile.py (+28/-12) lib/lp/archiveuploader/tests/test_dscfile.py (+55/-0) Text conflict in .bzrignore |
| To merge this branch: | bzr merge lp://staging/~intellectronica/launchpad/revert-production-devel-mess |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Björn Tillenius (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch reverts revisions 9086, 9084 and 9083. It corrects a previous attempt at reverting code which I haven't executed correctly, and fixes the build error in current production-devel.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
On Wed, Mar 10, 2010 at 01:42:25PM -0000, Tom Berger wrote:
> === modified file '.bzrignore'
> --- .bzrignore 2010-03-09 02:42:40 +0000
> +++ .bzrignore 2010-03-10 13:42:24 +0000
> @@ -60,5 +60,9 @@
> .testrepository
> .memcache.pid
> ./pipes
> +<<<<<<< TREE
> lib/canonical/
> tags.new
> +=======
> +tags.new
> +>>>>>>> MERGE-SOURCE
This doesn't look right. However, it seems like you specified the wrong
merge target. I got the branch, and confirmed that the diff against
r9082 contains only the diff of r9085, so it looks good to be merged
into production-devel.
vote approve
--
Björn Tillenius | https:/