← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-19 20:23:07 UTC
  • mfrom: (2520.4.136 bzr.mpbundle)
  • Revision ID: pqm@pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
Fix format strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
31
31
#\x20
32
32
booga"""
33
33
 
34
 
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.18)
 
34
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
35
35
# revision_id: example:
36
36
# target_branch: http://example.com
37
37
# testament_sha1: sha
51
51
#\x20
52
52
booga"""
53
53
 
54
 
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.18)
 
54
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
55
55
# revision_id: example:
56
56
# target_branch: http://example.com
57
57
# testament_sha1: sha
96
96
 
97
97
Aaron
98
98
 
99
 
# Bazaar merge directive format 2 (Bazaar 0.18)\r
 
99
# Bazaar merge directive format 2 (Bazaar 0.19)\r
100
100
# revision_id: example:
101
101
# target_branch: http://example.com
102
102
# testament_sha1: sha
268
268
From: J. Random Hacker <jrandom@example.com>
269
269
Subject: Commit of rev2a
270
270
 
271
 
# Bazaar merge directive format 2 \\(Bazaar 0.18\\)
 
271
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
272
272
# revision_id: rev2a
273
273
# target_branch: (.|\n)*
274
274
# testament_sha1: .*
294
294
From: J. Random Hacker <jrandom@example.com>
295
295
Subject: Commit of rev2a with special message
296
296
 
297
 
# Bazaar merge directive format 2 \\(Bazaar 0.18\\)
 
297
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
298
298
# revision_id: rev2a
299
299
# target_branch: (.|\n)*
300
300
# testament_sha1: .*