← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-06-08 05:00:01 UTC
  • mto: (4441.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: nmb@wartburg.edu-20090608050001-7znk3433urf3bf0p
Fix 269477 Add documentation about diverged branches and refer to it when pushing fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
63
63
Bug Fixes
64
64
*********
65
65
 
 
66
* Add documentation about diverged branches and how to fix them in the
 
67
  centralized workflow with local commits.  Mention ``bzr help
 
68
  diverged-branches`` when a push fails because the branches have
 
69
  diverged.  (Neil Martinsen-Burrell, #269477)
 
70
 
66
71
* Better message in ``bzr add`` output suggesting using ``bzr ignored`` to
67
72
  see which files can also be added.  (Jason Spashett, #76616)
68
73