/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/weave.py

  • Committer: Jelmer Vernooij
  • Date: 2009-03-28 14:24:46 UTC
  • mfrom: (4211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4212.
  • Revision ID: jelmer@samba.org-20090328142446-vqi0ksswdurga631
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
14
14
#
15
15
# You should have received a copy of the GNU General Public License
16
16
# along with this program; if not, write to the Free Software
17
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 
19
19
# Author: Martin Pool <mbp@canonical.com>
20
20
 
972
972
        super(WeaveFile, self).insert_record_stream(stream)
973
973
        self._save()
974
974
 
975
 
    @deprecated_method(one_five)
976
 
    def join(self, other, pb=None, msg=None, version_ids=None,
977
 
             ignore_missing=False):
978
 
        """Join other into self and save."""
979
 
        super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
980
 
        self._save()
981
 
 
982
975
 
983
976
def _reweave(wa, wb, pb=None, msg=None):
984
977
    """Combine two weaves and return the result.