/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 bzrlib/tests/test_merge_core.py

  • Committer: Martin Pool
  • Date: 2006-01-23 02:09:39 UTC
  • mfrom: (1534.1.11 integration)
  • Revision ID: mbp@sourcefrog.net-20060123020939-567fb193328ed7a6
[merge] robert's integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
14
14
from bzrlib.merge_core import (ApplyMerge3, make_merge_changeset,
15
15
                               BackupBeforeChange, ExecFlagMerge, WeaveMerge)
16
16
from bzrlib.changeset import Inventory, apply_changeset, invert_dict, \
17
 
    get_contents, ReplaceContents, ChangeExecFlag
 
17
    get_contents, ReplaceContents, ChangeExecFlag, Diff3Merge
18
18
from bzrlib.clone import copy_branch
19
19
from bzrlib.merge import merge
20
20
from bzrlib.workingtree import WorkingTree
531
531
            self.assert_(os.lstat(builder.this.full_path("3")).st_mode &0100 == 0000)
532
532
        builder.cleanup();
533
533
 
 
534
    def test_new_suffix(self):
 
535
        for merge_type in ApplyMerge3, Diff3Merge:
 
536
            builder = MergeBuilder()
 
537
            builder.add_file("1", "0", "name1", "text1", 0755)
 
538
            builder.change_contents("1", other="text3")
 
539
            builder.add_file("2", "0", "name1.new", "text2", 0777)
 
540
            cset = builder.merge_changeset(ApplyMerge3)
 
541
            os.lstat(builder.this.full_path("2"))
 
542
            builder.apply_changeset(cset)
 
543
            os.lstat(builder.this.full_path("2"))
 
544
            builder.cleanup()
 
545
 
534
546
 
535
547
class FunctionalMergeTest(TestCaseInTempDir):
536
548