← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Aaron Bentley
  • Date: 2010-04-24 00:29:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5186.
  • Revision ID: aaron@aaronbentley.com-20100424002912-np8lkz9u1l9a9mxq
Fix switch/merge when a ConfigurableFileMerger is used.

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
22
20
from bzrlib.trace import note
23
21
 
24
22