[PATCH] fix for merge-tests 30

[Lieven Govaerts <lg...@mobsol.be>]

Attached patch fixes merge test nr. 30 'merge_dir_replace'. The test
fails on trunk and 1.4.x in the post-commit phase when that commit
contains a replaced directory.

I've expanded the test a bit to catch some extra situations.

While the patch fixes the test, I'm not so sure if it's the best
solution. Can you have a look at it?

Lieven

[[[
Fix for issue 2607: when processing a replaced directory in the post-commit
phase, deleted files in that directory will still be in the entries file.
Don't process them twice!

* subversion/libsvn_wc/adm_ops.c
  (process_committed_internal): don't process files scheduled to be deleted
   in a replaced directory.

* subversion/tests/cmdline/merge_tests.py
  (test_list): merge_dir_replace is passing now
]]]