[SOLVED] IM7 svn broken: lost months of commits

[NicolasRobidoux]

I unfortunately deleted the directory tree I had, two hours ago, so I can't directly compare, but the code inside pixel.c is definitely outdated. It predates the changes to bicubic which introduced Catmull-Rom.

I'll be double checking that I did not so something silly, but I figured this was urgent to let the info out just in case something bad happened.

[NicolasRobidoux]

Indeed:
svn co https://www.imagemagick.org/subversion/ ... gick-7.0.0 ImageMagick
brings about a version of pixel.c which looks like it is several versions old, version that predates switching bicubic to Catmull-Rom and probably several other things.

[NicolasRobidoux]

svn trunk seems fine.

[NicolasRobidoux]

I put a copy of something which should be pretty close to what should be IM7 pixel.c here: http://web.cs.laurentian.ca/nrobidoux/m ... ed_pixel.c

[NicolasRobidoux]

svn log shows a jump from r7174 to r8212.

[NicolasRobidoux]

I made one single commit last week into 7.0.0. Could I have broken something? I svn ci right back to the web location from which I had svn co the source tree using
svn ci -m "mext -> next typo".

[NicolasRobidoux]

The log of svn trunk (IM6) does not show a large jump.
I am quite certain that the IM7 svn is broken.

[magick]

Development is in the Subversion trunk. Try

• svn co https://subversion.imagemagick.org/subv ... dows/trunk ImageMagick

Make your changes there and commit. Its the alpha development branch and all ImageMagick-7.0.0 alpha distribution releases are built from there.

[NicolasRobidoux]

So, I may have been the one who broke things by commiting back into https://www.imagemagick.org/subversion/ ... gick-7.0.0.
I'll stick to https://subversion.imagemagick.org/subv ... dows/trunk from now on.

[NicolasRobidoux]

magick: I know what went wrong: I've never used branches with svn (git only), and consequently completely misunderstood you when you wrote

Nicolas, don't forget you need to interpolate alpha separately and blend it into the color channel results. Here's the refactored code. You / Anthony can update this method in the Subversion trunk. Don't forget there are 4 locations. Two places in ImageMagick 7.0.0-0 and two in ImageMagick 6.7.7-6.

On top of it, I had forgotten that the "true" subversion repo is not the "public" one.
Apologies.

[NicolasRobidoux]

magick: You really want me to svn co and ci through ImageMagick-Windows or you actually want me to do it through the 7.0.0 and 6.7.7 branches of https://subversion.imagemagick.org/subv ... /branches/ (without merging back into trunk), or just touch https://subversion.imagemagick.org/subv ... ick/trunk/ or something else?
(Still reading about how to deal with multiple branches.)

[magick]

For the ImageMagick 7 alpha series, use

• svn co https://subversion.imagemagick.org/subv ... dows/trunk ImageMagick

Go to ImageMagick/ImageMagick and make your changes and commits from there. Periodically use

• svn update

to add any changes Anthony / Glenn / Cristy makes.

For the ImageMagick 6 stable series, use

• svn co https://subversion.imagemagick.org/subv ... geMagick-6 ImageMagick-6.7.7

go to ImageMagick-6.7.7 and make your changes and commits from there. Periodically use

• svn update

to add any changes Anthony / Glenn / Cristy makes.

In general, be very careful in the ImageMagick 6 series because its the stable release. You can be less careful in the ImageMagick 7 series because its alpha and is expected to break. Of course, don't break it if you can avoid it.

[NicolasRobidoux]

For the ImageMagick 7 alpha series, use

• svn co https://subversion.imagemagick.org/subv ... dows/trunk ImageMagick

Aahhh! You really do mean the ImageMagick-Windows trunk then, not the ImageMagick trunk, just inside the ImageMagick folder instead of at the top level.
I would never have guessed.

[anthony]

You can see what changes are between your copy and the SVN using

Code: Select all

 svn st

For commits I use

Code: Select all

svn st -q

to see what files I have changed (I never commit everything due to some personal changes)

Remember before you can commit you need to merge in the 'updates' from the SVN, and resolve any conflicts.

[NicolasRobidoux]

For the record, here is how I committed the changes to the one file I changed, pixel.c.
First I created an svn repo in my home dir:

Code: Select all

svn co https://subversion.imagemagick.org/subversion/ImageMagick-Windows/trunk ImageMagick

All I wanted to change at this point was the pixel.c file in ImageMagick-Windows/trunk/ImageMagick/MagickCore, which is actually in ~/ImageMagick/ImageMagick/MagickCore. I cd'd there and

Code: Select all

svn changelist INTERPOLATE pixel.c

Edited, double checked etc. Committed the changes with

Code: Select all

svn commit --changelist INTERPOLATE -m "pixel.c: clean up Catrom and fix Spline"