~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Aaron Bentley
  • Date: 2007-12-15 04:44:54 UTC
  • mto: This revision was merged to the branch mainline in revision 3132.
  • Revision ID: aaron.bentley@utoronto.ca-20071215044454-43118sh0ptmkfojx
Add warning when merge directives cause cherrypicks

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
 
23
23
   * ``reconfigure`` can now convert from repositories.  (Aaron Bentley)
24
24
 
 
25
   * ``merge`` now warns when merge directives cause cherrypicks.
 
26
     (Aaron Bentley)
 
27
 
25
28
  BUGFIXES:
26
29
 
27
30
   * Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)