~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

(John Arbash Meinel) Fix bug #104257 to handle unknown files in previously empty versioned directories

Show diffs side-by-side

added added

removed removed

Lines of Context:
99
99
    * Don't produce encoding error when adding duplicate files.
100
100
      (Aaron Bentley)
101
101
 
 
102
    * Fix ``InterDirstateTre._iter_changes`` to handle when we come across
 
103
      an empty versioned directory, which now has files in it.
 
104
      (John Arbash Meinel, #104257)
 
105
 
102
106
    * Teach ``common_ancestor`` to shortcut when the tip of one branch is
103
107
      inside the ancestry of the other. Saves a lot of graph processing
104
108
      (with an ancestry of 16k revisions, ``bzr merge ../already-merged``