[RFC] Begin fixing bug #233817: missing doesn't show merged revisions

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Sep 5 17:03:04 BST 2008


>>>>> "john" == John Arbash Meinel <john at arbash-meinel.com> writes:

<snip/>

    john> So the primary issue is that (as of yet) we can't do
    john> dotted revno numbering without accessing the full
    john> revision graph. And your work here:

    john> +    parent_map = graph.get_parent_map(ancestry)
    john> +    # filter out ghosts; merge_sort errors on ghosts.
    john> +    # XXX: is this needed here ? -- vila080903
    john> +    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
    john> +    # XXX: what if rev_graph is empty now ?
    john> +    merge_sorted_revisions = tsort.merge_sort(rev_graph, tip,
    john> +                                              None, generate_revno=True)

    john> ^- Will give wrong numbers for anything resembling
    john> complex history. I can give specific graphs that it
    john> will break, or you can just trust me. :)

I trust you and now understand why. So I will implement it by
grabbing the full history only if --include-merges is specified.


         Vincent



More information about the bazaar mailing list