[IPython-dev] [IPython-user] Porting SVN history to Launchpad - help needed.

Fernando Perez fperez.net@gmail....
Sun Jun 1 14:27:31 CDT 2008


On Sun, Jun 1, 2008 at 2:12 AM, David Cournapeau
<david@ar.media.kyoto-u.ac.jp> wrote:
> Fernando Perez wrote:
>>
>> By all means, if git/bzr does the job, go for it!
>>
>
> Ok, I tried different things without success, but I think I know why you
> cannot merge successfully the new branch into the old one: many files are in
> DOS format in the new trunk !
>
> file IPython/* on the first bzr revision gives me:
>
> IPython/background_jobs.py:    ASCII English text, with CRLF line
> terminators
> IPython/ColorANSI.py:          ASCII English text, with CRLF line
> terminators
> IPython/completer.py:          a python script text executable
> IPython/ConfigLoader.py:       ASCII English text, with CRLF line
> terminators
> IPython/CrashHandler.py:       ASCII English text, with CRLF line
> terminators
> IPython/Debugger.py:           ASCII English text, with CRLF line
> terminators
> IPython/deep_reload.py:        ASCII Java program text, with CRLF line
> terminators
> IPython/demo.py:               a python script text executable
> IPython/DPyGetOpt.py:          ASCII English text, with CRLF line
> terminators
> IPython/dtutils.py:            a python script text executable
> IPython/excolors.py:           ASCII English text
> IPython/Extensions:            directory
> IPython/external:              directory
> IPython/FakeModule.py:         ASCII English text, with CRLF line
> terminators
> IPython/generics.py:           ASCII Java program text
> IPython/genutils.py:           ASCII English text, with CRLF line
> terminators
> IPython/Gnuplot2.py:           ASCII English text, with CRLF line
> terminators
> IPython/GnuplotInteractive.py: ASCII English text, with CRLF line
> terminators
> IPython/GnuplotRuntime.py:     ASCII Java program text, with CRLF line
> terminators
> IPython/gui:                   directory
> IPython/history.py:            ASCII Java program text
> IPython/hooks.py:              a python script text executable
> IPython/__init__.py:           ASCII English text, with CRLF line
> terminators
> IPython/ipapi.py:              troff or preprocessor input text
> IPython/iplib.py:              ASCII English text, with CRLF line
> terminators
> IPython/ipmaker.py:            ASCII English text, with CRLF line
> terminators
> IPython/ipstruct.py:           ASCII English text, with CRLF line
> terminators
> IPython/irunner.py:            a python script text executable
> IPython/Itpl.py:               ASCII English text, with CRLF line
> terminators
> IPython/Logger.py:             ASCII C++ program text, with CRLF line
> terminators
> IPython/macro.py:              a python script text executable
> IPython/Magic.py:              ASCII English text, with CRLF line
> terminators
> IPython/numutils.py:           ASCII English text, with CRLF line
> terminators
> IPython/OInspect.py:           ASCII English text, with CRLF line
> terminators
> IPython/OutputTrap.py:         ASCII English text, with CRLF line
> terminators
> IPython/platutils_dummy.py:    ASCII English text
> IPython/platutils_posix.py:    ASCII Java program text
> IPython/platutils.py:          ASCII English text
> IPython/platutils_win32.py:    ASCII Java program text
> IPython/prefilter.py:          ASCII English text
> IPython/Prompts.py:            ASCII English text, with CRLF line
> terminators
> IPython/PyColorize.py:         ASCII Pascal program text, with CRLF line
> terminators
> IPython/Release.py:            ASCII English text, with CRLF line
> terminators
> IPython/rlineimpl.py:          ASCII English text
> IPython/shadowns.py:           a python script text executable
> IPython/Shell.py:              ASCII English text, with CRLF line
> terminators
> IPython/strdispatch.py:        ASCII Java program text
> IPython/ultraTB.py:            ASCII English text, with CRLF line
> terminators
> IPython/upgrade_dir.py:        a python script text executable
> IPython/usage.py:              ASCII English text, with CRLF line
> terminators
> IPython/UserConfig:            directory
> IPython/wildcard.py:           UTF-8 Unicode English text
> IPython/winconsole.py:         a python script text executable
>
> I am afraid it will be a nightmare to merge. I am trying to get the first
> version without any CRLF line terminator, and diffing from there,


Argh!!! I have no idea how that happened, I only work under Linux.
But we've had cases before of devs who work under Win32 committing
accidentally DOS-formatted files.  I used to notice right away because
old XEmacs showed the ^M characters at the end  of the lines.  But
these days, Emacs fixes that silently and hides them out (it does show
a little 'DOS' marker on the bottom left).

But which branch do you see this on? If I look for example at Magic.py
on either the launchpad-svn branch (the one from vcs-imports) or on
the  main stable-dev one, I don't get the DOS marker. I suppose it's
possible that there are *mixed* EOL markers in those files, that Emacs
is failing to detect.  It probably only scans the first few lines to
make a decision, so chances  are what we have is a mess of files with
mixed line endings.

I'm leaning towards simply ditching our history for the last three
months.  I spent a fair amount of time yesterday on it without success
(I tried lots of things) and so have you with git.  I've just gone on
IRC to ask on the bzr channel, I might get a bit of help there. But I
have a bunch of 'life' related things to do today, so unless an easy
solution materializes, I think we'll just have to move forward.

But thanks for trying, and if you do come up with a solution, by all
means let us know!

Cheers,

f


More information about the IPython-dev mailing list