~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-06 04:32:17 UTC
  • mfrom: (1551.16.3 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
Don't crash on merging renames of deleted files (#110279)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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: