~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by 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
187
187
            other_tree.commit('modify all sample files and dirs.')
188
188
        finally:
189
189
            other_tree.unlock()
190
 
        this_tree.merge_from_branch(other_tree.branch)
 
190
        self.merge(other_tree.branch, this_tree)
191
191
        os.chdir('this')
192
192
        out,err = self.run_bzr("commit", "-m", "added")
193
193
        os.chdir('..')