← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
534
534
        dir = self.make_bzrdir('source')
535
535
        try:
536
536
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
537
 
                referenced_branch)
 
537
                target_branch=referenced_branch)
538
538
        except errors.IncompatibleFormat:
539
539
            # this is ok too, not all formats have to support references.
540
540
            return
637
637
        dir = self.make_bzrdir('source')
638
638
        try:
639
639
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
640
 
                referenced_branch)
 
640
                target_branch=referenced_branch)
641
641
        except errors.IncompatibleFormat:
642
642
            # this is ok too, not all formats have to support references.
643
643
            return
702
702
        dir = self.make_bzrdir('source')
703
703
        try:
704
704
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
705
 
                referenced_branch)
 
705
                target_branch=referenced_branch)
706
706
        except errors.IncompatibleFormat:
707
707
            # this is ok too, not all formats have to support references.
708
708
            return
977
977
        dir = self.make_bzrdir('source')
978
978
        try:
979
979
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
980
 
                referenced_branch)
 
980
                target_branch=referenced_branch)
981
981
        except errors.IncompatibleFormat:
982
982
            # this is ok too, not all formats have to support references.
983
983
            return
997
997
        dir = self.make_bzrdir('source')
998
998
        try:
999
999
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1000
 
                referenced_tree.branch)
 
1000
                target_branch=referenced_tree.branch)
1001
1001
        except errors.IncompatibleFormat:
1002
1002
            # this is ok too, not all formats have to support references.
1003
1003
            return
1023
1023
        dir = self.make_bzrdir('source')
1024
1024
        try:
1025
1025
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1026
 
                referenced_tree.branch)
 
1026
                target_branch=referenced_tree.branch)
1027
1027
        except errors.IncompatibleFormat:
1028
1028
            # this is ok too, not all formats have to support references.
1029
1029
            return
1088
1088
        dir = self.make_bzrdir('source')
1089
1089
        try:
1090
1090
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1091
 
                referenced_branch)
 
1091
                target_branch=referenced_branch)
1092
1092
        except errors.IncompatibleFormat:
1093
1093
            # this is ok too, not all formats have to support references.
1094
1094
            return
1114
1114
        dir = self.make_bzrdir('source')
1115
1115
        try:
1116
1116
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1117
 
                referenced_branch)
 
1117
                target_branch=referenced_branch)
1118
1118
        except errors.IncompatibleFormat:
1119
1119
            # this is ok too, not all formats have to support references.
1120
1120
            return
1886
1886
        thisdir = self.make_bzrdir('this')
1887
1887
        try:
1888
1888
            bzrlib.branch.BranchReferenceFormat().initialize(
1889
 
                thisdir, master)
 
1889
                thisdir, target_branch=master)
1890
1890
        except errors.IncompatibleFormat:
1891
1891
            return
1892
1892
        unused_repo = thisdir.create_repository()