/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

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