16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from bzrlib.branch import Branch, BranchReferenceFormat
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat
19
from bzrlib.branch import Branch
20
from bzrlib.bzrdir import BzrDir
21
21
from bzrlib.errors import AlreadyBranchError, BzrError, DivergedBranches
22
from bzrlib.inventory import Inventory
23
22
from bzrlib.merge import Merger, Merge3Merger
24
23
from bzrlib.osutils import has_symlinks
25
24
from bzrlib.progress import DummyProgress
26
25
from bzrlib.repository import Repository
27
from bzrlib.tests import KnownFailure, TestCaseWithTransport
28
26
from bzrlib.trace import mutter
29
from bzrlib.workingtree import WorkingTree
32
from time import sleep
34
30
from bzrlib.plugins.svn import core, format, ra
35
from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
31
from bzrlib.plugins.svn.errors import MissingPrefix
36
32
from bzrlib.plugins.svn.commit import push, dpush
37
33
from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
38
34
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
438
434
self.build_tree({'mybranch/foo': 'bladata'})
439
435
wt = self.bzrdir.open_workingtree()
440
436
revid = wt.commit(message="Commit from Bzr")
441
push(Branch.open("%s/trunk" % self.repos_url), wt.branch.repository,
437
b = Branch.open("%s/trunk" % self.repos_url)
438
push(b.repository.get_graph(), b, wt.branch.repository,
442
439
wt.branch.revision_history()[-2])
443
440
mutter('log %r' % self.client_log("%s/trunk" % self.repos_url, 0, 4)[4][0])
444
441
self.assertEquals('M',
445
442
self.client_log("%s/trunk" % self.repos_url, 0, 4)[4][0]['/trunk'][0])
446
push(Branch.open("%s/trunk" % self.repos_url), wt.branch.repository, wt.branch.last_revision())
443
b = Branch.open("%s/trunk" % self.repos_url)
444
push(b.repository.get_graph(), b, wt.branch.repository, wt.branch.last_revision())
447
445
mutter('log %r' % self.client_log("%s/trunk" % self.repos_url, 0, 5)[5][0])
448
446
self.assertEquals("/branches/mybranch",
449
447
self.client_log("%s/trunk" % self.repos_url, 0, 5)[5][0]['/trunk'][1])