← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
323
323
    1 Joe Foo\t2005-11-22
324
324
      rev-1
325
325
 
326
 
Use --include-merged or -n0 to see merged revisions.
 
326
Use --include-merges or -n0 to see merged revisions.
327
327
""",
328
328
            wt.branch, log.ShortLogFormatter,
329
329
            formatter_kwargs=dict(show_advice=True))
1335
1335
        self.assertFormatterResult("""\
1336
1336
------------------------------------------------------------
1337
1337
revno: 2
1338
 
fixes bugs: test://bug/id test://bug/2
 
1338
fixes bug(s): test://bug/id test://bug/2
1339
1339
author: Joe Bar <joe@bar.com>
1340
1340
committer: Joe Foo <joe@foo.com>
1341
1341
branch nick: work
1346
1346
  message
1347
1347
------------------------------------------------------------
1348
1348
revno: 1
1349
 
fixes bug: test://bug/id
 
1349
fixes bug(s): test://bug/id
1350
1350
committer: Joe Foo <joe@foo.com>
1351
1351
branch nick: work
1352
1352
timestamp: Tue 2005-11-22 00:00:00 +0000
1359
1359
        tree = self.make_commits_with_bugs()
1360
1360
        self.assertFormatterResult("""\
1361
1361
    2 Joe Bar\t2005-11-22
1362
 
      fixes bugs: test://bug/id test://bug/2
 
1362
      fixes bug(s): test://bug/id test://bug/2
1363
1363
      multiline
1364
1364
      log
1365
1365
      message
1366
1366
 
1367
1367
    1 Joe Foo\t2005-11-22
1368
 
      fixes bug: test://bug/id
 
1368
      fixes bug(s): test://bug/id
1369
1369
      simple log message
1370
1370
 
1371
1371
""",