← 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 17:08:05 UTC
  • mfrom: (3144.4.2 resolve-parent-kind)
  • Revision ID: pqm@pqm.ubuntu.com-20080103170805-t22jan69n4n5kkub
Handle conflicts in parent file kind gracefully (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
94
94
     user:pass embedded in the urls.
95
95
     (Vincent Ladeuil, #177643)
96
96
 
 
97
   * Files inside non-directories are now handled like other conflict types.
 
98
     (Aaron Bentley, #177390)
 
99
 
97
100
   * ``reconfigure`` is able to convert trees into lightweight checkouts.
98
101
     (Aaron Bentley)
99
102