Merge lp:~ubuntu-branches/ubuntu/oneiric/python-django/oneiric-201108291626 into lp:ubuntu/oneiric/python-django

Proposed by Ubuntu Package Importer
Status: Merged
Merged at revision: 35
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/python-django/oneiric-201108291626
Merge into: lp:ubuntu/oneiric/python-django
Diff against target: 23 lines (+17/-0) (has conflicts)
1 file modified
debian/patches/09_test_view_decorator_sleep.diff (+17/-0)
Conflict adding file debian/patches/09_test_view_decorator_sleep.diff.  Moved existing file to debian/patches/09_test_view_decorator_sleep.diff.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/python-django/oneiric-201108291626
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+73902@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/python-django reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/python-django/oneiric-201108291626. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Minor history improvement; merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/09_test_view_decorator_sleep.diff'
2--- debian/patches/09_test_view_decorator_sleep.diff 1970-01-01 00:00:00 +0000
3+++ debian/patches/09_test_view_decorator_sleep.diff 2011-09-02 22:57:02 +0000
4@@ -0,0 +1,17 @@
5+Description: Increase the sleep time before the final cache timeout
6+ test. The original sleep of 2s works locally but fails on the build
7+ machines.
8+Author: Barry Warsaw <barry@ubuntu.com>
9+Bug: https://code.djangoproject.com/ticket/16686
10+
11+--- a/tests/regressiontests/cache/tests.py
12++++ b/tests/regressiontests/cache/tests.py
13+@@ -1426,7 +1426,7 @@
14+ self.assertEqual(response.content, 'Hello World 10')
15+
16+ # And if we wait a few more seconds
17+- time.sleep(2)
18++ time.sleep(5)
19+
20+ # the custom timeouot cache will miss
21+ response = other_with_timeout_view(request, '18')
22
23=== renamed file 'debian/patches/09_test_view_decorator_sleep.diff' => 'debian/patches/09_test_view_decorator_sleep.diff.moved'

Subscribers

People subscribed via source and target branches

to all changes: