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

  • Committer: Robert Collins
  • Date: 2009-08-26 03:20:32 UTC
  • mfrom: (4637 +trunk)
  • mto: (4634.6.2 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: robertc@robertcollins.net-20090826032032-mx5kiog3eihaoy13
Merge and cherrypick outstanding 2.0 relevant patches from bzr.dev: Up to rev
4637, then 4639,4641,4643,4646,4649,4650,4651. (Robert Collins)

Log messages of the incorporated fixes:

revno: 4651 [merge]
  (robertc) Enable commit via record_iter_changes for specific file
        comments. (Robert Collins)

revno: 4650 [merge]
  Fix shelve on windows. (Robert Collins, #305006)

revno: 4649 [merge]
  (robertc) Make iter_changes produce output that is always safe to
        generate inventory deltas of in the same direction as the
        changes. (Robert Collins, #347649)

revno: 4646 [merge]
  (mbp) developer documentation about content filtering

revno: 4643 [merge]
  (mbp) small tweaks to release documentation

revno: 4641 [merge]
  (abentley) Shelve will not remove tree root.

revno: 4639 [merge]
  (andrew) Fix 'Revision ... not present' errors when upgrading stacked
        branches.

revno: 4637 [merge]
  Fix upgrade of branches in repositories.

revno: 4636 [merge]
  (mbp) fix crash formatting CannotBindAddress

revno: 4635 [merge]
  (robertc) Fix many locking errors on windows due to a small bug in
        merge.transform_tree. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
184
184
        self.assertEqual('', err)
185
185
 
186
186
 
187
 
class UpgradeRecommendedTests(TestCaseInTempDir):
 
187
class UpgradeRecommendedTests(TestCaseWithTransport):
188
188
 
189
189
    def test_recommend_upgrade_wt4(self):
190
190
        # using a deprecated format gives a warning
200
200
        out, err = self.run_bzr('revno a')
201
201
        if err.find('upgrade') > -1:
202
202
            self.fail("message shouldn't suggest upgrade:\n%s" % err)
 
203
 
 
204
    def test_upgrade_shared_repo(self):
 
205
        repo = self.make_repository('repo', format='2a', shared=True)
 
206
        branch = self.make_branch_and_tree('repo/branch', format="pack-0.92")
 
207
        self.get_transport('repo/branch/.bzr/repository').delete_tree('.')
 
208
        out, err = self.run_bzr(['upgrade'], working_dir='repo/branch')