~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-01-25 05:54:08 UTC
mfrom: (1185.50.54 bzr-jam-integration)
mto: (1530.2.4 test-apis) (1185.50.55 bzr-jam-integration) (1534.11.2 test-pb) (1553.5.2 bzr.dev (Main development branch)) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1550.
Revision ID: robertc@robertcollins.net-20060125055408-decd09a9f3f91658

Merge from jam-integration.

added added

removed removed

import os

import time

from bzrlib.builtins import merge

from bzrlib.branch import Branch

from bzrlib.tests import TestCaseInTempDir

from bzrlib.errors import NoCommonAncestor, NoCommits

from bzrlib.errors import NoSuchRevision

from bzrlib.merge import merge

from bzrlib.revisionspec import RevisionSpec

class TestRevisionNamespaces(TestCaseInTempDir):