← Back to branch summary

~brz/brz-debian/byoci

« back to all changes in this revision

Viewing changes to tests/blackbox/test_do.py

  • Committer: James Westby
  • Date: 2009-02-18 18:36:18 UTC
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: jw+debian@jameswestby.net-20090218183618-0wuajt2nbtpcooag
Kill off export-upstream mode.

merge-upstream will be improved to merge the upstream branch, store it with
pristine-tar, and then produce the tarball as needed.

Using export-upstream for snapshots is now incorrect. You should use
"merge-upstream" every time instead, which will track if there is nothing
to do, and handle conflicts. You can autocommit the merge and build the
result if you like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/blackbox/test_do.py
172
172
      os.environ['SHELL'] = old_shell
173
173
    self.failUnlessExists('debian/shell')
174
174
 
175
 
  def test_export_upstream(self):
176
 
    tree = self.make_unpacked_source()
177
 
    self.make_merge_mode_config(tree)
178
 
    f = open('.bzr-builddeb/default.conf', 'ab')
179
 
    try:
180
 
      f.write('export-upstream = upstream\n')
181
 
    finally:
182
 
      f.close()
183
 
    upstream = self.make_branch_and_tree('upstream')
184
 
    self.build_tree(['upstream/a'])
185
 
    upstream.add(['a'])
186
 
    upstream.commit('one')
187
 
    self.run_bzr(['bd-do', 'mkdir debian/dir'])
188
 
    self.failUnlessExists('debian/dir')
189
 
 
190
175
# vim: ts=2 sts=2 sw=2