Re: Merge bugs

> I tried running merge with --force, but it didn't make a difference.
> Gustavo, did you find a reasonable work around?

Yes, but it's a quick-n-dirty hack. :-)

Here is a script, which runs non-recursively (-N). Notice that
it still breaks if there are missing *files* in any given directory.

parentdir=`pwd`
repos=https://oops.kerneljanitors.org/repos/apt-rpm/vendor/trunk
revs=20:21

for dir in `find -type d`; do
        cd $dir
        subdir=`echo "$dir" | sed 's/\.\///'`
        if [ -d .svn ]; then
                echo "Merging $subdir... "
                svn merge -N -r $revs $repos/$subdir
                if [ $? -eq 0 ]; then
                        echo "Done merging $subdir!"
                else
                        echo "Failed merging $subdir!"
                fi
        fi
        cd $parentdir
done

-- 
Gustavo Niemeyer
[ 2AAC 7928 0FBF 0299 5EB5  60E2 2253 B29A 6664 3A0C ]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org