~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3533.2.1.

  • 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: