← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-15 17:06:47 UTC
  • mfrom: (4441.1.1 bzr.ab.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090615170647-5zu6h93br8c4ue6i
(nmb) Add docs about diverged branches and refer to it when pushing
        fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
9
9
In Development
10
10
##############
11
11
 
 
12
Bug Fixes
 
13
*********
 
14
 
 
15
* Add documentation about diverged branches and how to fix them in the
 
16
  centralized workflow with local commits.  Mention ``bzr help
 
17
  diverged-branches`` when a push fails because the branches have
 
18
  diverged.  (Neil Martinsen-Burrell, #269477)
 
19
 
12
20
Internals
13
21
*********
14
22
 
18
26
  rather than requiring all command names be known a-priori.
19
27
  (Robert Collins)
20
28
 
21
 
 
22
29
bzr 1.16rc1 "It's yesterday in California" 2009-06-11
23
30
#####################################################
24
31
:Codename: yesterday-in-california