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

  • Committer: John Arbash Meinel
  • Date: 2011-05-17 11:27:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5880.
  • Revision ID: john@arbash-meinel.com-20110517112758-eayd47x2h1jdp4zo
https://launchpad.net/bugs/781168
Fix bug #781168, and allow WT.update_basis_by_delta
to apply a delta that does not match the WT state. The check is nice to have
for commit, but it doesn't make sense to have for uncommit, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-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
118
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
 
    lines = iter(f.readlines())
 
121
    try:
 
122
        lines = iter(f.readlines())
 
123
    finally:
 
124
        f.close()
122
125
 
123
126
    try:
124
127
        l = lines.next()