← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Robert Collins
  • Date: 2006-09-04 08:00:00 UTC
  • mto: (1981.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
921
921
            sys.stderr = real_stderr
922
922
            sys.stdin = real_stdin
923
923
 
 
924
    @symbol_versioning.deprecated_method(symbol_versioning.zero_eleven)
924
925
    def merge(self, branch_from, wt_to):
925
926
        """A helper for tests to do a ui-less merge.
926
927