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 |
2520.4.136 | 18 years ago | Aaron Bentley | Fix format strings | 7.5 KB |
|
|
|
v08.py |
3376.2.4 | 17 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 20.3 KB |
|
|
|
v09.py |
2520.4.15 | 18 years ago | Aaron Bentley | Fix _get_bundle invocations | 2.4 KB |
|
|
|
v4.py |
3350.8.13 | 17 years ago | Robert Collins | Merge bzr.dev, fixing minor skew. | 22.8 KB |
|
|