Erik Huelsmann wrote:
> I thought that this has been in trunk for a while now? /me has a look.
> Yea, svn_wc_process_committed_queue() @since New in 1.5. Are you sure
> the issue is really fixed, or are we talking about different patches?
Erik,
in the thread about issue 2607 (
http://svn.haxx.se/dev/archive-2006-09/0727.shtml ), Malcolm reported an
issue during merge resulting in error 'Log command for directory 'x' is
mislocated'. In your reply to that mail you say the failures should be
solved with your patch. There's no mention in the thread whether or not
the patch was committed and since issue 2607 is still open I presumed not.
So, if you say that patch was committed to trunk then it doesn't solve
the issue I'm reporting and created a testcase for (merge_tests.py 30).
FYI, this is the result of running that test on the mac buildslave:
CMD: svn "ci" "--username" "jrandom" "--password" "rayjandom" "-m" "log msg" "svn-test-work/working_copies/merge_tests-30" "--config-dir" "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.890717>
svn: Commit succeeded, but other errors follow:
svn: Error bumping revisions post-commit (details follow):
svn: In directory '/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-30/A/C/foo'
svn: Error processing command 'committed' in '/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-30/A/C/foo'
svn: Log command for directory 'new file' is mislocated
XFAIL: merge_tests.py 30: merge a replacement of a directory
> So, exactly which part of the patch do you want added to 1.4.x?
The part that fixes that test :)
Lieven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 8 18:13:21 2006