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

  • Committer: John Arbash Meinel
  • Date: 2008-08-07 22:26:48 UTC
  • mto: This revision was merged to the branch mainline in revision 3614.
  • Revision ID: john@arbash-meinel.com-20080807222648-ako39zeldqibnk40
Fix the merge_sort code so that it properly increments.
We had a small bug where if you had branches descend from new
roots, as well as sub-branches within them, the branch counter
would skip, and then repeat itself. (the root was a post-increment,
while sub-branches were pre-increment.)
This changes both to be pre-increment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textfile.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Utilities for distinguishing binary files from text files"""
18
18
 
19
 
from itertools import chain
 
19
from itertools import chain 
20
20
 
21
21
from bzrlib.errors import BinaryFile
22
22
from bzrlib.iterablefile import IterableFile