/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge_core.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
import os
18
18
import sys
19
19
 
20
 
import bzrlib
21
 
from bzrlib import (
 
20
import breezy
 
21
from .. import (
22
22
    controldir,
23
23
    errors,
24
24
    generate_ids,
25
25
    merge_directive,
26
26
    osutils,
27
27
    )
28
 
from bzrlib.conflicts import (
 
28
from ..conflicts import (
29
29
    ContentsConflict,
30
30
    TextConflict,
31
31
    PathConflict,
32
32
    )
33
 
from bzrlib.merge import (
 
33
from ..merge import (
34
34
    Merge3Merger,
35
35
    Diff3Merger,
36
36
    WeaveMerger,
37
37
    Merger,
38
38
    )
39
 
from bzrlib.osutils import getcwd, pathjoin
40
 
from bzrlib.transform import TreeTransform
41
 
from bzrlib.tests import TestCaseWithTransport, TestSkipped
42
 
from bzrlib.workingtree import WorkingTree
 
39
from ..osutils import getcwd, pathjoin
 
40
from ..transform import TreeTransform
 
41
from . import TestCaseWithTransport, TestSkipped
 
42
from ..workingtree import WorkingTree
43
43
 
44
44
 
45
45
class MergeBuilder(object):
186
186
            try:
187
187
                parent_dir = os.path.dirname(orig_inventory[file_id])
188
188
            except:
189
 
                print file_id
 
189
                print(file_id)
190
190
                raise
191
191
            if parent_dir == "":
192
192
                return None
596
596
        a_wt.commit('r0')
597
597
        self.run_bzr('branch a b')
598
598
        b_wt = WorkingTree.open('b')
599
 
        os.chmod('b/file', 0755)
 
599
        os.chmod('b/file', 0o755)
600
600
        os.remove('a/file')
601
601
        a_wt.commit('removed a')
602
602
        self.assertEqual(a_wt.branch.revno(), 2)