[bzr-fastimport:MERGE] Fix win32

[Matt Nordhoff]

SuperMMX wrote:
> Hi, Alexander Belchenko <bialix at ukr.net> :
> 
> On Mon, 10 Mar 2008 09:03:48 +0200
> Alexander Belchenko <bialix at ukr.net> wrote:
> 
>>> What's the format of the merge directive for other projects than bzr.dev ?
>>> [project/MERGE] ??
>> Yes, or [project:MERGE] if you like.
> 
>> We have special service BundleBuggy (http://bundlebuggy.aaronbentley.com) that
>> tracks our bzr.dev patches. It catch merge requests with subject started with '[MERGE'
>> string.
> 
> Thank you very much for your explanation. Here is new bundle.

I'm not a reviewer and don't know bzr-fastimport's codebase, but...

> +        import sys,os

That should probably be done on two lines.

        import os
        import sys

> +            if line.endswith('\r\n'):
> +                return line[:-2]
> +            elif line.endswith('\n'):
> +                return line[:-1]

You can use "line.rstrip('\r\n')" to strip \r\n, \n, \r or \r\n. (Or
something like \n\n\n\n, but using readline() should prevent that.)
--