/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: Vincent Ladeuil
  • Date: 2012-01-18 10:29:50 UTC
  • mto: This revision was merged to the branch mainline in revision 6440.
  • Revision ID: v.ladeuil+lp@free.fr-20120118102950-vz7bsvm7euqx9ue5
https://launchpad.net/bugs/917549
Mentioning the milestone URL in annoucements gives an easy access to the detailed description of the release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
16
16
 
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
 
19
 
 
20
19
"""Weave - storage of related text file versions"""
21
20
 
 
21
from __future__ import absolute_import
22
22
 
23
23
# XXX: If we do weaves this way, will a merge still behave the same
24
24
# way if it's done in a different order?  That's a pretty desirable