← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1312
1312
                        source_path = entry[0][0] + '/' + entry[0][1]
1313
1313
                    else:
1314
1314
                        source_path = entry[0][1]
1315
 
                    target_path = new_path_utf8 + source_path[len(old_path):]
 
1315
                    if new_path_utf8:
 
1316
                        target_path = new_path_utf8 + source_path[len(old_path):]
 
1317
                    else:
 
1318
                        assert len(old_path) > 0, ("cannot rename directory to"
 
1319
                                                   " itself")
 
1320
                        target_path = source_path[len(old_path) + 1:]
1316
1321
                    adds.append((None, target_path, entry[0][2], entry[1][1], False))
1317
1322
                    deletes.append(
1318
1323
                        (source_path, target_path, entry[0][2], None, False))