/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_branch.py

Fix unpeel map.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
45
45
    )
46
46
 
47
47
from bzrlib.plugins.git import (
48
 
    LocalGitControlDirFormat,
49
48
    branch,
50
49
    tests,
51
50
    )
 
51
from bzrlib.plugins.git.dir import (
 
52
    LocalGitControlDirFormat,
 
53
    )
52
54
from bzrlib.plugins.git.mapping import (
53
55
    default_mapping,
54
56
    )
236
238
        inter_branch.pull(stop_revision=revid1)
237
239
        self.assertEquals(revid1, newbranch.last_revision())
238
240
 
239
 
    def test_interbranch_limited_pull(self):
 
241
    def test_interbranch_pull_with_tags(self):
240
242
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
243
        gitrepo = GitRepo(path)
 
244
        gitrepo.refs["refs/tags/sometag"] = gitsha2
241
245
        oldrepo = Repository.open(path)
242
246
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
243
247
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
244
248
        newbranch = self.make_branch('g')
245
249
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
246
 
        inter_branch.pull(limit=1)
 
250
        inter_branch.pull(stop_revision=revid1)
247
251
        self.assertEquals(revid1, newbranch.last_revision())
248
 
        inter_branch.pull(limit=1)
249
 
        self.assertEquals(revid2, newbranch.last_revision())
 
252
        self.assertTrue(newbranch.repository.has_revision(revid2))
250
253
 
251
254
 
252
255
class ForeignTestsBranchFactory(object):