/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/blackbox/test_bundle_info.py

  • Committer: Jonathan Lange
  • Date: 2009-12-09 09:20:42 UTC
  • mfrom: (4881 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4907.
  • Revision ID: jml@canonical.com-20091209092042-s2zgqcf8f39yzxpj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
35
35
        finally:
36
36
            bundle.close()
37
37
        info = self.run_bzr('bundle-info bundle')[0]
38
 
        self.assertContainsRe(info, 'file: 1 .0 multiparent.')
 
38
        # there might be either one file, or two, depending on whether the
 
39
        # tree root counts...
 
40
        self.assertContainsRe(info, 'file: [12] .0 multiparent.')
39
41
        self.assertContainsRe(info, 'nicks: source')
40
42
        self.assertNotContainsRe(info, 'foo')
41
43
        self.run_bzr_error(['--verbose requires a merge directive'],