← 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-05-29 20:34:27 UTC
  • mfrom: (3287.17.2 lca_with_null_235715)
  • Revision ID: pqm@pqm.ubuntu.com-20080529203427-tp2iw6h86fd1sauh
(jam) Fix bug #235715,
        use an empty list for an LCA base if we encounter NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
43
43
 
44
44
  BUGFIXES:
45
45
 
 
46
    * ``bzr merge --lca`` should handle when two revisions have no common
 
47
      ancestor other than NULL_REVISION. (John Arbash Meinel, #235715)
 
48
 
46
49
    * ``bzr push`` with both ``--overwrite`` and ``-r NNN`` options no longer
47
50
      fails.  (Andrew Bennetts, #234229)
48
51