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

  • Committer: Robert Collins
  • Date: 2005-09-26 08:56:15 UTC
  • mto: (1092.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050926085615-99b8fb35f41b541d
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
1
1
import os
 
2
import shutil
 
3
import tempfile
2
4
import unittest
3
5
 
4
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
7
from bzrlib.branch import ScratchBranch, Branch
6
8
from bzrlib.errors import NotBranchError, NotVersionedError
7
 
 
8
 
 
9
 
import tempfile
10
 
import shutil
11
9
from bzrlib.inventory import InventoryEntry, RootEntry
12
 
from bzrlib.osutils import file_kind
 
10
from bzrlib.osutils import file_kind, rename
13
11
from bzrlib import changeset
14
12
from bzrlib.merge_core import (ApplyMerge3, make_merge_changeset,
15
13
                                BackupBeforeChange, PermissionsMerge)
16
14
from bzrlib.changeset import Inventory, apply_changeset, invert_dict
17
15
 
 
16
 
18
17
class FalseTree(object):
19
18
    def __init__(self, realtree):
20
19
        self._realtree = realtree
100
99
 
101
100
    def change_path(self, id, path):
102
101
        old_path = os.path.join(self.dir, self.inventory[id])
103
 
        os.rename(old_path, self.abs_path(path))
 
102
        rename(old_path, self.abs_path(path))
104
103
        self.inventory[id] = path
105
104
 
106
105