← 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: John Arbash Meinel
  • Date: 2007-07-20 14:28:59 UTC
  • mfrom: (2625.6.3 bzr.email_message)
  • mto: This revision was merged to the branch mainline in revision 2640.
  • Revision ID: john@arbash-meinel.com-20070720142859-a24s0khul0yw91bh
(Adeodato Simó) EmailMessage class, allowing much nicer access to Email object than stdlib

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
251
251
        md.bundle = value
252
252
 
253
253
 
254
 
EMAIL1 = """To: pqm@example.com
255
 
From: J. Random Hacker <jrandom@example.com>
 
254
EMAIL1 = """From: "J. Random Hacker" <jrandom@example.com>
256
255
Subject: Commit of rev2a
 
256
To: pqm@example.com
 
257
User-Agent: Bazaar \(.*\)
257
258
 
258
259
# Bazaar merge directive format 1
259
260
# revision_id: rev2a
264
265
"""
265
266
 
266
267
 
267
 
EMAIL1_2 = """To: pqm@example.com
268
 
From: J. Random Hacker <jrandom@example.com>
 
268
EMAIL1_2 = """From: "J. Random Hacker" <jrandom@example.com>
269
269
Subject: Commit of rev2a
 
270
To: pqm@example.com
 
271
User-Agent: Bazaar \(.*\)
270
272
 
271
273
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
272
274
# revision_id: rev2a
277
279
"""
278
280
 
279
281
 
280
 
EMAIL2 = """To: pqm@example.com
281
 
From: J. Random Hacker <jrandom@example.com>
 
282
EMAIL2 = """From: "J. Random Hacker" <jrandom@example.com>
282
283
Subject: Commit of rev2a with special message
 
284
To: pqm@example.com
 
285
User-Agent: Bazaar \(.*\)
283
286
 
284
287
# Bazaar merge directive format 1
285
288
# revision_id: rev2a
290
293
# message: Commit of rev2a with special message
291
294
"""
292
295
 
293
 
EMAIL2_2 = """To: pqm@example.com
294
 
From: J. Random Hacker <jrandom@example.com>
 
296
EMAIL2_2 = """From: "J. Random Hacker" <jrandom@example.com>
295
297
Subject: Commit of rev2a with special message
 
298
To: pqm@example.com
 
299
User-Agent: Bazaar \(.*\)
296
300
 
297
301
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
298
302
# revision_id: rev2a