← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Andrew Bennetts
  • Date: 2010-10-28 02:02:19 UTC
  • mto: (5050.45.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5536.
  • Revision ID: andrew.bennetts@canonical.com-20101028020219-r67h0oct6t1lkqy4
https://launchpad.net/bugs/603395
Merge tags from local to master when committing in a bound branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
19
19
Bug Fixes
20
20
*********
21
21
 
 
22
* Commit in a bound branch or heavyweight checkout now propagates new tags
 
23
  (e.g. from a merge) to the master branch (and informs the user if there
 
24
  is a conflict).  (Andrew Bennetts, #603395)
 
25
  
22
26
* ``NotBranchError`` no longer allows errors from calling
23
27
  ``bzrdir.open_repository()`` to propagate.  This is unhelpful at best,
24
28
  and at worst can trigger infinite loops in callers.  (Andrew Bennetts)