/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: Johan Dahlberg
  • Date: 2007-03-03 05:47:31 UTC
  • mto: (2312.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2314.
  • Revision ID: johan_d@lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
Fix bzrtools shelve command for removed lines beginning with "--"
 (Johan Dahlberg, bug #75577)

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