/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-27 06:10:18 UTC
  • mfrom: (3309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080327061018-dxztpxyv6yoeg3am
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
222
222
    message:
223
223
      merge branch 2
224
224
        ------------------------------------------------------------
225
 
        revno: 1.1.1.1.1
 
225
        revno: 1.2.1
226
226
        committer: Lorem Ipsum <test@example.com>
227
227
        branch nick: smallerchild
228
228
        timestamp: Just now
258
258
message:
259
259
  merge branch 2
260
260
    ------------------------------------------------------------
261
 
    revno: 1.1.1.1.1
 
261
    revno: 1.2.1
262
262
    committer: Lorem Ipsum <test@example.com>
263
263
    branch nick: smallerchild
264
264
    timestamp: Just now
280
280
message:
281
281
  merge branch 2
282
282
    ------------------------------------------------------------
283
 
    revno: 1.1.1.1.1
 
283
    revno: 1.2.1
284
284
    committer: Lorem Ipsum <test@example.com>
285
285
    branch nick: smallerchild
286
286
    timestamp: Just now