← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/treebuilder.py

  • Committer: Rory Yorke
  • Date: 2010-09-24 16:16:13 UTC
  • mto: This revision was merged to the branch mainline in revision 5455.
  • Revision ID: rory.yorke@gmail.com-20100924161613-269xiflsrhqrhydh
Added --show-base to pull and update (bug 202374).

Behaviour copied from merge.  Tests in
tests/blackbox/test_{pull,update}.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/treebuilder.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""TreeBuilder helper class.
18
18
 
19
 
TreeBuilders are used to build trees of various shapres or properties. This
 
19
TreeBuilders are used to build trees of various shapes or properties. This
20
20
can be extremely useful in testing for instance.
21
21
"""
22
22