← 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: Martin Pool
  • Date: 2007-08-09 03:39:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2693.
  • Revision ID: mbp@sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
Fix up other references to 0.19

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.19)
 
34
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
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.19)
 
54
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
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.19)\r
 
99
# Bazaar merge directive format 2 (Bazaar 0.90)\r
100
100
# revision_id: example:
101
101
# target_branch: http://example.com
102
102
# testament_sha1: sha
270
270
To: pqm@example.com
271
271
User-Agent: Bazaar \(.*\)
272
272
 
273
 
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
 
273
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
274
274
# revision_id: rev2a
275
275
# target_branch: (.|\n)*
276
276
# testament_sha1: .*
298
298
To: pqm@example.com
299
299
User-Agent: Bazaar \(.*\)
300
300
 
301
 
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
 
301
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
302
302
# revision_id: rev2a
303
303
# target_branch: (.|\n)*
304
304
# testament_sha1: .*