← 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: 2008-01-03 23:18:14 UTC
  • mfrom: (3146.5.4 test-merge-uncommitted)
  • Revision ID: pqm@pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
Make merge --uncommitted work with merge-type weave/lca (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
93
93
     correctly, instead of erroring or attributing incorrect parents to ghosts.
94
94
     (Aaron Bentley)
95
95
 
 
96
   * ``merge --weave --uncommitted`` now works.  (Aaron Bentley)
 
97
 
96
98
   * pycurl authentication handling was broken and incomplete. Fix handling of
97
99
     user:pass embedded in the urls.
98
100
     (Vincent Ladeuil, #177643)