~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 13:36:48 UTC
  • mto: This revision was merged to the branch mainline in revision 3535.
  • Revision ID: john@arbash-meinel.com-20080709133648-3b03z59rcalc4rjx
(bug #243536) tsort.merge_sorted() should work even with a ghost in mainline.

There is a bit of a discrepency when it comes to ghosts.
The revision_graph passed to merge_sorted has had ghosts stripped,
because it cannot handle pointing to nodes that aren't present.
(Thinks there is a graph cycle.)
However, the mainline_history includes the ghost.
For now, work around this by ignoring the ghost in the mainline
history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
 
38
38
  BUGFIXES:
39
39
 
 
40
    * ``bzr log --long`` with a ghost in your mainline now handles that
 
41
      ghost properly. (John Arbash Meinel, #243536)
 
42
 
40
43
    * ``check`` handles the split-up .bzr layout correctly, so no longer
41
44
      requires a branch to be present.
42
45
      (Daniel Watkins, #64783)