← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/tree_creator/heavily_merged.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tree creator for many commits, but no changes"""
18
18
 
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