Rev 4620: Merge test_log fix for 2a. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4620 [merge]
revision-id: robertc at robertcollins.net-20090814045733-0k2k1ibt5bk5abzd
parent: robertc at robertcollins.net-20090814044446-431g8dtrw1u92jh2
parent: robertc at robertcollins.net-20090814045318-2hys5g1krz9fu3ij
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Fri 2009-08-14 14:57:33 +1000
message:
  Merge test_log fix for 2a.
modified:
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-05-08 13:39:32 +0000
+++ b/bzrlib/tests/test_log.py	2009-08-14 04:53:18 +0000
@@ -142,6 +142,9 @@
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
         committed_msg = lf.revisions[0].rev.message
+        if msg == committed_msg:
+            raise tests.KnownFailure(
+                "Commit message was preserved, but it wasn't expected to be.")
         self.assertNotEqual(msg, committed_msg)
         self.assertTrue(len(committed_msg) > len(msg))