← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Michael Hudson
  • Date: 2007-11-29 13:23:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3189.
  • Revision ID: michael.hudson@canonical.com-20071129132346-jn46168dkl0st0tb
restore the default behaviour of Merge3Merger.__init__().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1017
1017
        this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1018
1018
        this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1019
1019
        this.tt.apply()
1020
 
        merger = Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1021
 
        merger.do_merge()
 
1020
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1022
1021
 
1023
1022
        # textual merge
1024
1023
        self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1084
1083
 
1085
1084
        for tg in this, base, other:
1086
1085
            tg.tt.apply()
1087
 
        merger = Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1088
 
        merger.do_merge()
 
1086
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1089
1087
        self.assertIs(os.path.isdir(this.wt.abspath('a')), True)
1090
1088
        self.assertIs(os.path.islink(this.wt.abspath('b')), True)
1091
1089
        self.assertIs(os.path.isfile(this.wt.abspath('c')), True)
1132
1130
 
1133
1131
        for tg in [this, base, other]:
1134
1132
            tg.tt.apply()
1135
 
        merger = Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1136
 
        merger.do_merge()
 
1133
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1137
1134
        self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
1138
1135
        self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
1139
1136
        self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
1160
1157
 
1161
1158
        for tg in [this, base, other]:
1162
1159
            tg.tt.apply()
1163
 
        merger = Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1164
 
        merger.do_merge()
 
1160
        Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1165
1161
 
1166
1162
        self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1167
1163
        self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)