← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Aaron Bentley
  • Date: 2007-06-06 01:07:25 UTC
  • mto: This revision was merged to the branch mainline in revision 2510.
  • Revision ID: aaron.bentley@utoronto.ca-20070606010725-cusa72npg70khhkk
https://launchpad.net/bugs/110279
Don't crash on merging renamed deleted files (#110279)

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
54
54
    * WorkingTree.remove works correctly with tree references, and when pwd is
55
55
      not the tree root. (Aaron Bentley)
56
56
 
 
57
    * Merge no longer fails when a file is renamed in one tree and deleted
 
58
      in the other. (Aaron Bentley, #110279)
 
59
 
57
60
bzr 0.16  2007-05-07
58
61
  
59
62
  BUGFIXES: