← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-27 15:38:14 UTC
  • mfrom: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111027153814-0r4nd2io1jv6t47f
Merge 2.4 into trunk including fix for bug #880701

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
3048
3048
                existing_file, new_file = conflict[2], conflict[1]
3049
3049
            else:
3050
3050
                existing_file, new_file = conflict[1], conflict[2]
3051
 
            new_name = tt.final_name(existing_file)+'.moved'
 
3051
            new_name = tt.final_name(existing_file) + '.moved'
3052
3052
            tt.adjust_path(new_name, final_parent, existing_file)
3053
3053
            new_conflicts.add((c_type, 'Moved existing file to',
3054
3054
                               existing_file, new_file))