To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2008-07-09 13:36:48 UTC
- 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.
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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 1.4 KB |
|
|
|
ElementTree.py |
1963.2.6 | 19 years ago | Robey Pointer | pychecker is on crack; go back to using 'is None'. | 39.9 KB |
|
|