← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
33
33
from bzrlib.trace import mutter, warning
34
34
from bzrlib.fetch import greedy_fetch
35
35
from bzrlib.revision import is_ancestor
 
36
from bzrlib.osutils import rename
 
37
 
36
38
 
37
39
# comments from abentley on irc: merge happens in two stages, each
38
40
# of which generates a changeset object