← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/weavebench.py

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/weavebench.py
51
51
            if lines:
52
52
                del lines[randrange(0, len(lines))]
53
53
 
54
 
        rev_id = wf.add("%s" % i, parents, lines)
 
54
        rev_id = wf.add(parents, lines)
55
55
        parents = [rev_id]
56
56
 
57
57
    write_weave(wf, file(WEAVE_NAME, 'wb'))