← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Committer: Aaron Bentley
Date: 2006-02-07 21:40:33 UTC
mto: (1534.7.127 Transactional Tree Transforms)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: abentley@panoramicfeedback.com-20060207214033-bfeef6ca0e6638a9

Merge from Robert

files added:
bzrlib/tests/blackbox/test_ancestry.py

bzrlib/tests/blackbox/test_find_merge_base.py

bzrlib/tests/test_doc_generate.py

generate_docs.py

tools/__init__.py

tools/doc_generate

tools/doc_generate/__init__.py

tools/doc_generate/autodoc_bash_completion.py

files removed:
bzrlib/tests/blackbox/test_find_merge_base.py

files renamed:
bzr_man.py => tools/doc_generate/autodoc_man.py

files modified:
.bzrignore

NEWS

bzrlib/_changeset.py

bzrlib/builtins.py

bzrlib/commands.py

bzrlib/errors.py

bzrlib/fetch.py

bzrlib/plugin.py

bzrlib/store/text.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_status.py

bzrlib/tests/test_weave.py

bzrlib/transport/ftp.py

bzrlib/weave.py

setup.py

Show diffs side-by-side

added added

removed removed

bzrlib/tests/blackbox/test_status.py

29

29

from tempfile import TemporaryFile

30

30

import codecs

31

31

32

from bzrlib.clone import copy_branch

33

32

from bzrlib.branch import Branch

34

33

from bzrlib.builtins import merge

35

34

from bzrlib.revisionspec import RevisionSpec

Older »