← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/tree_creator/heavily_merged.py

  • Committer: Benoît Pierre
  • Date: 2009-02-24 00:25:32 UTC
  • mfrom: (4035 +trunk)
  • mto: (4056.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 4058.
  • Revision ID: benoit.pierre@gmail.com-20090224002532-i2f64ou15pa7if2y
Merge with upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/tree_creator/heavily_merged.py
28
28
 
29
29
class HeavilyMergedTreeCreator(TreeCreator):
30
30
    """Create a tree in which almost every commit is a merge.
31
 
   
32
 
    No file changes are included.  This produces two trees, 
 
31
 
 
32
    No file changes are included.  This produces two trees,
33
33
    one of which is returned.  Except for the first commit, every
34
34
    commit in its revision-history is a merge of another commit in the other
35
 
    tree.  
 
35
    tree.
36
36
    Not hardlinking the working tree, because there are no working tree files.
37
37
    """
38
38