[SOLVED] IM7 svn tree bug?

[NicolasRobidoux]

Code: Select all

svn up
Skipped 'aclocal.m4'
At revision 9388.
Summary of conflicts:
  Skipped paths: 1

yet aclocal.m4 is nowhere within the the IM7 tree. It's only found in the IM6 tree.
Am I doing something wrong?

[NicolasRobidoux]

If I don't get a response, I'll try http://www.mail-archive.com/dev@forrest ... 02490.html as suggested by http://stackoverflow.com/questions/3048 ... pped-paths.]
Or maybe I'll poke around based on http://little418.com/2009/05/svn-local- ... merge.html.

[NicolasRobidoux]

I bet you anything some of my earlier forced merges broke my tree.

[NicolasRobidoux]

Code: Select all

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

appears to have fixed things.