← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-11 15:45:55 UTC
  • mfrom: (5588.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20110111154555-xmu386vs0qoigyhl
(vila) Document the packaging helper scripts. (Max Bowsher)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
16
16
 
17
17
 
18
18
import os
19
 
import shutil
20
19
 
21
20
from bzrlib import check, osutils
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
 
21
from bzrlib.errors import PointlessCommit
24
22
from bzrlib.tests import (
25
23
    SymlinkFeature,
26
24
    TestCaseWithTransport,
27
25
    )
28
 
from bzrlib.tests.test_revision import make_branches
29
26
 
30
27
 
31
28
class TestCommitMerge(TestCaseWithTransport):