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

Fix GitBranchBuilder to use refs/heads/master instead of refs/head/master.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_builder.py
78
78
                                           timestamp=1194586400,
79
79
                                           timezone='+0100'))
80
80
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n'
81
 
                             'commit refs/head/master\n'
 
81
                             'commit refs/heads/master\n'
82
82
                             'mark :2\n'
83
83
                             'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
84
84
                             'data 18\n'
102
102
                            base=r1)
103
103
 
104
104
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
105
 
                             'commit refs/head/master\n'
 
105
                             'commit refs/heads/master\n'
106
106
                             'mark :2\n'
107
107
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
108
108
                             'data 5\n'
110
110
                             '\n'
111
111
                             'M 100644 :1 foo\n'
112
112
                             '\n'
113
 
                             'commit refs/head/master\n'
 
113
                             'commit refs/heads/master\n'
114
114
                             'mark :3\n'
115
115
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
116
116
                             'data 6\n'
117
117
                             'second'
118
118
                             '\n'
119
119
                             '\n'
120
 
                             'commit refs/head/master\n'
 
120
                             'commit refs/heads/master\n'
121
121
                             'mark :4\n'
122
122
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
123
123
                             'data 5\n'
143
143
                            merge=[r2])
144
144
 
145
145
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
146
 
                             'commit refs/head/master\n'
 
146
                             'commit refs/heads/master\n'
147
147
                             'mark :2\n'
148
148
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
149
149
                             'data 5\n'
151
151
                             '\n'
152
152
                             'M 100644 :1 foo\n'
153
153
                             '\n'
154
 
                             'commit refs/head/master\n'
 
154
                             'commit refs/heads/master\n'
155
155
                             'mark :3\n'
156
156
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
157
157
                             'data 6\n'
158
158
                             'second'
159
159
                             '\n'
160
160
                             '\n'
161
 
                             'commit refs/head/master\n'
 
161
                             'commit refs/heads/master\n'
162
162
                             'mark :4\n'
163
163
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
164
164
                             'data 5\n'
166
166
                             '\n'
167
167
                             'from :2\n'
168
168
                             '\n'
169
 
                             'commit refs/head/master\n'
 
169
                             'commit refs/heads/master\n'
170
170
                             'mark :5\n'
171
171
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
172
172
                             'data 5\n'