plasma <plasmaball@pchome.com.tw> writes:
> Hi all,
>
> I tried to merge codes from different version of subversion, but I
> got strange results. You could repeat it by the following commands:
>
> tar xzvf subversion-0.23.0.tar.gz
> tar xzvf subversion-0.24.0.tar.gz
> svnadmin create SVN
> svn mkdir file://`pwd`/SVN/vendor -m "* vendor directory"
> svn import file://`pwd`/SVN/vendor subversion-0.23.0 \
> subversion-0.23.0 -m "* subversion 0.23.0"
> svn import file://`pwd`/SVN/vendor subversion-0.24.0 \
> subversion-0.24.0 -m "* subversion 0.24.0"
> svn cp file://`pwd`/SVN/vendor/subversion-0.23.0 \
> file://`pwd`/SVN/trunk -m "* use 0.23.0 as trunk start."
> svn co file://`pwd`/SVN/trunk svn
> cd svn
> svn merge file://`pwd`/SVN/vendor/subversion-0.23.0 \
> file://`pwd`/SVN/vendor/subversion-0.24.0 svn
>
> Then it ends with the following error message (complete output is at
> the end of the mail):
>
> svn: Unmergeable scheduling requested on an entry
> svn: Can not add 'svn/apr/apr' to a parent directory scheduled for deletion
>
> It seems strange because there's no file or directory named apr/apr.
> Can someone explain this?
See issue #1249 -- I think it covers your bug.
http://subversion.tigris.org/issues/show_bug.cgi?id=1249
Until this bug is fixed, though, you can consider passing the
--ignore-ancestry flag to the merge operation, and see if that helps.
You'll lose the copy ancestory information when you commit, but if
you're like me, you couldn't care less about that. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 16 10:12:01 2003