/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-26 15:21:29 UTC
  • mto: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111026152129-jqfkx8zl3g0735f7
Cosmetic change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
3068
3068
                existing_file, new_file = conflict[2], conflict[1]
3069
3069
            else:
3070
3070
                existing_file, new_file = conflict[1], conflict[2]
3071
 
            new_name = tt.final_name(existing_file)+'.moved'
 
3071
            new_name = tt.final_name(existing_file) + '.moved'
3072
3072
            tt.adjust_path(new_name, final_parent, existing_file)
3073
3073
            new_conflicts.add((c_type, 'Moved existing file to',
3074
3074
                               existing_file, new_file))