# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pardus@cpan.org-20071031192847-jb4ye7jmcv6j0p1j
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: bcd8d861fbb05ef4051d8b01cffb2ead890ca2e9
# timestamp: 2007-10-31 19:28:55 +0000
# base_revision_id: pqm@pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
# 
# Begin patch
=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2007-10-25 06:17:57 +0000
+++ bzrlib/bzrdir.py	2007-10-31 19:28:47 +0000
@@ -1300,7 +1300,10 @@
         try:
             return klass._formats[format_string]
         except KeyError:
-            raise errors.UnknownFormatError(format=format_string)
+	    if format_string[-2:] == "\r\n":
+	        raise errors.LineEndingError(file=".bzr/branch-format")
+	    else:
+	        raise errors.UnknownFormatError(format=format_string)
 
     @classmethod
     def get_default_format(klass):

=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2007-10-31 12:40:19 +0000
+++ bzrlib/errors.py	2007-10-31 19:28:47 +0000
@@ -670,6 +670,10 @@
     _fmt = "Unknown branch format: %(format)r"
 
 
+class LineEndingError(BzrError)
+
+    _fmt = "Line ending corrupted for file: %(file)s\nMaybe your files got corrupted in transport?"
+
 class IncompatibleFormat(BzrError):
     
     _fmt = "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQfx2QIAAkVfgEQwU2v///Me
Ag6////wUAT49QAJmCLSRhJKJqbJk0j0yMU02iYjyR6T1AA0ABzCYBMAJhMJpgAAEyaaBhIkTQQp
5oUeTU/Uj0hp6gbU0aHqPU9R6gaHMJgEwAmEwmmAAATJpoGEkgEAJiCaNACnqemSZPUNBk0Mk0TC
3PrLJapvCVIOP0Ph24Uotaah4bLqTqSxtFezJErDCc70lVpDaaPlTSviYxttrjwXOdNMHmiKi+B1
QQ6d3Lndkq5/YHEEPDlS//crqXOplUFrFRirt36M/n69HZdcSN8e0fJ23TigwhDWHIZCbVtfFh2r
odW36dhlNAZrOatA7TkzatkbkEaY8pfq/ax5/5OGgpNjL1qncD2lnQeGs0rmGY6r3bEg7zoJyeDx
3IHgtQdA0CZJxCQw5CmEAZPIYyLChI/weeOwDberKr3rDC9VoWB2XpwVDATdSspgO53dml00x8qm
zVakP9h46JVT9NuRZRA+xWmYxUeQEp6SZnK9CKFuBPBi4sHUqyMzIgQAiWsiXaVDDHhOO1k4GGBR
JA+kTAtxNTyHGyjYDmtBytGW3UmWlZOYwwEDPRZlAxMSstMVaA24uB2Fx3k4nntIVmhUWKg4qWxj
cFRI+2+NzWKTysqIGRGORvML1tzkO3yTK1mKg7IG1doDi8Bt1Css3OQrjUkcCBKV8SBpSGAXmZoU
LAOuFDfVUQGJExEcRhoSkMTPFRNhC8NazMviguMxim45jYZGsilxa1mM2WgQVqkiTZFXqbmS97Gz
zittZGU6nB0Jv0jVlNHBYeSVkFjiVJIMVPUsuUsBt8eESOwuvyZMre6TpVlp5/ndcO1NDp2X1C6y
QukrMgajf/Rx1FD9eg4VjS490qxuQIHlzjiA99cMCBvl7bYWQjbBi4DqVpSMTEZaYDRNnLM1y28z
t5lWlaWnE8DqC1ZEC4yL4m6LWXh5B80HID37rENPI7jiRPwNDIxCgSNg/FLoJlp9P5s0NMjrVgd6
myBx4neelrtLXHu2mI7r7+A4CJE0LaK7zOKwL+8/FpEyKHmF5cT8GMt5pk3pl1jz4JhTzq3TdM8P
FuIadJvDdaXIK0Qjv0OBgON6qJLh7H5dxmOZT/69YwDpY4O1zXZ1zPjMwDKoD9v/FepVCcIMUiGh
dzDkUiTxyzq3IkXjEvBH3CxhfImGly0PQSIL6oymxBpeMNy0gTgPgcVwGOkidnRko0RhnfHUiclw
U/WuqbcusWlaD1ArVnlyvONcu1axgx9ovZAwfd7grWU1QrRI4kFGeJpZu+/pttKNNi1KFi2V9ATx
MDfNEhg5IigeL7sTUUeujTXuqWz87sfgBw5b70H16D4gxAblyDpqV4dufN6KyhXWNFcwsaCrIZOD
hrxTeCjqqR3ncYVK1BbugDNv1mdqWTGgddxcTQTlPMG1B1hUigGNkDZNQtcpInFg9CDvlRaHJ28L
lBAxEOmutWNNEhoc9ziPsuy6Cqas+oOL3bFfHUKWqpmHn71IknuHKDBkyseVKfJfHHjzqyiukg07
gKXJkEbdj0RpDYJ37P+T8vHcBq81VjKQ9mR/i7kinChIA/jsgQA=