/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 breezy/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2017-10-27 00:18:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6799.
  • Revision ID: jelmer@jelmer.uk-20171027001842-o77sekj0g2t2zwbn
Properly escape backslashes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_directive.py
296
296
EMAIL1 = """From: "J. Random Hacker" <jrandom@example.com>
297
297
Subject: Commit of rev2a
298
298
To: pqm@example.com
299
 
User-Agent: Bazaar \(.*\)
 
299
User-Agent: Bazaar \\(.*\\)
300
300
 
301
301
# Bazaar merge directive format 1
302
302
# revision_id: rev2a
310
310
EMAIL1_2 = """From: "J. Random Hacker" <jrandom@example.com>
311
311
Subject: Commit of rev2a
312
312
To: pqm@example.com
313
 
User-Agent: Bazaar \(.*\)
 
313
User-Agent: Bazaar \\(.*\\)
314
314
 
315
315
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
316
316
# revision_id: rev2a
324
324
EMAIL2 = """From: "J. Random Hacker" <jrandom@example.com>
325
325
Subject: Commit of rev2a with special message
326
326
To: pqm@example.com
327
 
User-Agent: Bazaar \(.*\)
 
327
User-Agent: Bazaar \\(.*\\)
328
328
 
329
329
# Bazaar merge directive format 1
330
330
# revision_id: rev2a
338
338
EMAIL2_2 = """From: "J. Random Hacker" <jrandom@example.com>
339
339
Subject: Commit of rev2a with special message
340
340
To: pqm@example.com
341
 
User-Agent: Bazaar \(.*\)
 
341
User-Agent: Bazaar \\(.*\\)
342
342
 
343
343
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
344
344
# revision_id: rev2a