~bzr-pqm/bzr/bzr.dev

Committer: John Arbash Meinel
Date: 2006-01-24 19:16:02 UTC
mfrom: (1545.2.10 bzr.ab)
mto: (1534.1.16 integration) (1185.79.1 bzr-jam-pending) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1550.
Revision ID: john@arbash-meinel.com-20060124191602-681e9da1f16e695e

[merge] bzr.ab: Make merge internals private.

added added

removed removed

from bzrlib.errors import NoCommonAncestor, NoCommits

from bzrlib.errors import NoSuchRevision

from bzrlib.clone import copy_branch

from bzrlib.merge import merge

from bzrlib.builtins import merge

from bzrlib.revisionspec import RevisionSpec

class TestRevisionNamespaces(TestCaseInTempDir):