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

  • Committer: Aaron Bentley
  • Date: 2007-03-09 21:51:41 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
Change format marker to not experimental

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
23
23
    )
24
24
 
25
25
 
26
 
OUTPUT1 = """# Bazaar merge directive format experimental-1
 
26
OUTPUT1 = """# Bazaar merge directive format 1
27
27
# revision_id: example:
28
28
# target_branch: http://example.com
29
29
# testament_sha1: sha
32
32
booga"""
33
33
 
34
34
 
35
 
OUTPUT2 = """# Bazaar merge directive format experimental-1
 
35
OUTPUT2 = """# Bazaar merge directive format 1
36
36
# revision_id: example:
37
37
# target_branch: http://example.com
38
38
# testament_sha1: sha
115
115
From: J. Random Hacker <jrandom@example.com>
116
116
Subject: Commit of rev2a
117
117
 
118
 
# Bazaar merge directive format experimental-1
 
118
# Bazaar merge directive format 1
119
119
# revision_id: rev2a
120
120
# target_branch: (.|\n)*
121
121
# testament_sha1: .*
128
128
From: J. Random Hacker <jrandom@example.com>
129
129
Subject: Commit of rev2a with special message
130
130
 
131
 
# Bazaar merge directive format experimental-1
 
131
# Bazaar merge directive format 1
132
132
# revision_id: rev2a
133
133
# target_branch: (.|\n)*
134
134
# testament_sha1: .*