search

google / ipaddr-py

Google's Python IP address manipulation library
Apache License 2.0
194 stars 71 forks source link

Incorrect SVN export #114

Closed JonathonReinhart closed 9 years ago

JonathonReinhart commented 9 years ago

The tool or person who exported this from SVN to Git did not know what they were doing. Passing -s tells git-svn that the SVN repo used a "standard" layout (trunk/, tags/, branches/) and creates the Git equivalents.

Can someone please re-do this the right way? I would, but I can't access the original google code webpage.

pmoody- commented 9 years ago

highly unlikely.

code.google.com/p/ipaddr-py redirects to github.com/google/ipaddr-py, so I don't think anyone has access to the original svn repo.

JonathonReinhart commented 9 years ago

The original SVN repo is still accessible. I'm actually in the process of correctly making this a Git repo right now.

pmoody- commented 9 years ago

OOC, what's actually broken?

JonathonReinhart commented 9 years ago

The /trunk, /tags, /branches directories are an SVN-ism and shouldn't really be visible in Git. When I git clone this repo, I should have the same working copy that you had when this was developed in SVN.

JonathonReinhart commented 9 years ago

Have a look at https://github.com/JonathonReinhart/ipaddr-py. It's not perfect, because there are a lot of strange gaps that occur when you "merge" in SVN without actually merging, or push to tags.

JonathonReinhart commented 9 years ago

Also, I see that ipaddr is at 2.1.11 on pypi, but there's no 2.1.11 tag in SVN.

pmoody- commented 9 years ago

I believe the cutover to git happened long before 2.1.11 was cut.

As far as re-importing this, I'm disinclined to spend any time on it but maybe Mike or someone else who's still at google might be willing.

JonathonReinhart commented 9 years ago

I spent some time on it, but it didn't come out perfect. There are lots of gaps, and I'm not sure why. It might need some real surgery. I just hate to see history get trashed.

shields commented 9 years ago

Ok, I've tried to fix this using a reimport, and generally cleaned up a bit. It's not great, but maybe we can keep things clean going forward.

JonathonReinhart commented 9 years ago

Thanks, this looks a lot better. There is still a "wiki" directory in the top-level directory on "master", but that can probably be cleaned up, like you said.