Merge lp:~lifeless/bzr/broken into lp:bzr

Proposed by Robert Collins
Status: Work in progress
Proposed branch: lp:~lifeless/bzr/broken
Merge into: lp:bzr
Diff against target: 11 lines (+1/-0)
1 file modified
bzrlib/tests/test_selftest.py (+1/-0)
To merge this branch: bzr merge lp:~lifeless/bzr/broken
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+23476@code.launchpad.net

Commit message

You, surfs up.

Description of the change

Testing pqm, this branch is deliberately broken.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

On Thu, 2010-04-15 at 11:57 +0000, Robert Collins wrote:
> The proposal to merge lp:~lifeless/bzr/broken into lp:bzr has been updated.
>
> Status: Approved => Queued
> Queue Position: (not set) => 68
Queue position ? Is this new?

Cheers,

Jelmer

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge:

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge:

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge:

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: [Errno 2] No such file or directory

Revision history for this message
Robert Collins (lifeless) wrote :

Exception processing merge: 'module' object has no attribute 'exit'

Revision history for this message
John A Meinel (jameinel) wrote :

Set to WIP because I was tired of getting "failure" messages from PQM every 5 minutes.

Revision history for this message
Robert Collins (lifeless) wrote :

I am sorry about the spam, you can mute this branch if you like.

Revision history for this message
Robert Collins (lifeless) wrote :

Successful steps
Failure output:
All lines of log output:Could not determine branch type for u'/home/pqm/archives/thelove/bzr/+trunk'

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Revision history for this message
Robert Collins (lifeless) wrote :

PQM is not as fragile now, no need to keep tossing broken branches at it. For now.

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Robert Collins <email address hidden> writes:

    > PQM is not as fragile now, no need to keep tossing broken branches at it. For now.

While I got mails for failed submissions (conflicts or nothing to
merge), I've still never received an error email for submitting *this*
proposal...

Revision history for this message
Robert Collins (lifeless) wrote :

On Fri, Jun 18, 2010 at 6:34 PM, Vincent Ladeuil <email address hidden> wrote:
>>>>>> Robert Collins <email address hidden> writes:
>
>    > PQM is not as fragile now, no need to keep tossing broken branches at it. For now.
>
> While I got mails for failed submissions (conflicts or nothing to
> merge), I've still never received an error email for submitting *this*
> proposal...

No idea why; when you told me you hadn't I tried again and got an
error mail for this branch immediately after.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Bringing it back for test, sorry for the nois, I'll reject it when I'm done.

Unmerged revisions

5159. By Robert Collins

break a test.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/test_selftest.py'
2--- bzrlib/tests/test_selftest.py 2010-02-23 07:43:11 +0000
3+++ bzrlib/tests/test_selftest.py 2010-04-15 11:59:27 +0000
4@@ -959,6 +959,7 @@
5 self.assertEqual(0, result.error_count)
6
7 def test_strict_with_unsupported_feature(self):
8+ raise AssertionError("broken test")
9 result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0,
10 verbosity=1)
11 test = self.get_passing_test()