search

openstreetmap / openstreetmap-mirror

Scripts to mirror remote repositories to http://github.com/openstreetmap
62 stars 24 forks source link

JOSM mirroring script going mad ;) #3

Closed floscher closed 9 years ago

floscher commented 9 years ago

Today the mirroring script for josm added 12 new commits which "bump externals".

But these commits do effectively nothing (see the before and after comparison) but blowing up the history and probably also the total size of the repository (if git hasn't a trick up its sleeves for this special situation).

These commits form pairs of commits that negate each other. The first one removes the osm-standard-icons, the second one readds the exact same revision, the third one removes Apache Commons Compressor, the fourth one readds it again, and so on…

It would be better, if the script would check if any new revisions are available before bumping externals.

avar commented 9 years ago

Thanks. I'll check out this crazyness tomorrow. On 29 Jun 2015 11:52 pm, "Florian Schäfer" notifications@github.com wrote:

Today the mirroring script for josm added 12 new commits which "bump externals".

But these commits do effectively nothing (see the before and after comparison https://github.com/openstreetmap/josm/compare/d42148c7e19312d8f279dc29ff65fdf346f265e3...13158cc62f419cc02464284a59883734c7aa3dbb) but blowing up the history and probably also the total size of the repository (if git hasn't a trick up its sleeves for this special situation).

These commits form pairs of commits that negate each other. The first one removes the osm-standard-icons, the second one readds the exact same revision, the third one removes Apache Commons Compressor, the fourth one readds it again, and so on…

It would be better, if the script would check if any new revisions are available before bumping externals.

— Reply to this email directly or view it on GitHub https://github.com/openstreetmap/openstreetmap-mirror/issues/3.

avar commented 9 years ago

Sorry about the delay, I may have just fixed this in 671f6f3a103c5ab94fdc601f0647c86bb50631c6, but maybe not, in any case I hard-pushed some new history and fixed a bug where it wasn't cloning all the externals.

So now cloning it and doing "ant" works to build JOSM again!

Please do tell me if it fails again, I'll do some further debugging / checking to make sure it doesn't re-add these things all the time.

floscher commented 9 years ago

Thank you for the fix.

Today I saw, that there is again some problem with svn-externals in the JOSM-mirror: https://github.com/openstreetmap/josm/compare/84a6a06f3fb391e653f64924d6ac4df05dd449d3...mirror

The mirroring script has added some files with names like svn-1Q5Af8, many of them are empty.

avar commented 9 years ago

This should be "fixed" now with https://github.com/openstreetmap/openstreetmap-mirror/commit/1bc67815b1b3b7633d453e7498ca87eb6ab3299a

This whole mirroring script is still a bunch of duct taped hacks. Let's see how this patch does.

I could fix this more extensively by starting to maintain a .gitignore. Which would include:

svn-*
build/
dist/
src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen/
floscher commented 9 years ago

Such a .gitignore would be a good idea to avoid the svn-* files from being committed. The other three directories would probably be irrelevant for the mirroring script (but still useful for people who clone the repo), as these are only populated when running ant.

For my part, I don't necessarily need an extra fix, as I maintain my own git-mirror for my work on JOSM.