← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
67
67
    * Don't produce encoding error when adding duplicate files.
68
68
      (Aaron Bentley)
69
69
 
 
70
    * Teach ``common_ancestor`` to shortcut when the tip of one branch is
 
71
      inside the ancestry of the other. Saves a lot of graph processing
 
72
      (with an ancestry of 16k revisions, ``bzr merge ../already-merged``
 
73
      changes from 2m10s to 13s).  (John Arbash Meinel, #103757)
 
74
 
70
75
  TESTING:
71
76
 
72
77
    * Added ``bzrlib.strace.strace`` which will strace a single callable and