← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-27 01:04:45 UTC
  • mfrom: (5162.3.4 fix-switch-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20100427010445-rargwg6u8xyjv80b
(abentley) Fix switch with per-file mergers (#559436)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
17
17
# Original author: David Allouche
18
18
 
19
19
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
21
 
from bzrlib.bzrdir import BzrDir
 
20
from bzrlib.branch import Branch
22
21
from bzrlib.trace import note
23
22
 
24
23