[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Problem with svn merge

From: plasma <plasmaball_at_pchome.com.tw>
Date: 2003-06-16 09:50:36 CEST

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?

BTW, this error occurs on 0.23 and 0.24.

plasma

* Complete output of svn merge:

D svn/svn_private_config.h.in
D svn/svn_private_config.h.in
A svn/svn_private_config.h.in
A svn/Makefile.in.orig
D svn/ChangeLog.CVS
D svn/ChangeLog.CVS
A svn/ChangeLog.CVS
D svn/configure
D svn/configure
A svn/configure
D svn/Makefile.in
D svn/Makefile.in
A svn/Makefile.in
D svn/PORTING
D svn/PORTING
A svn/PORTING
D svn/apr/configure
D svn/apr/config.layout
D svn/apr/Makefile.in
D svn/apr/STATUS
D svn/apr/docs/APRDesign.html
D svn/apr/docs/doxygen.conf
D svn/apr/docs/incomplete_types
D svn/apr/docs/non_apr_programs
D svn/apr/docs/win32_builds.html
D svn/apr/docs/canonical_filenames.html
D svn/apr/docs
D svn/apr/strings/Makefile.in
D svn/apr/strings/apr_fnmatch.c
D svn/apr/strings/apr_cpystrn.c
D svn/apr/strings/apr_snprintf.c
D svn/apr/strings/apr_strtok.c
D svn/apr/strings/apr_strings.c
D svn/apr/strings/apr_strnatcmp.c
D svn/apr/strings
D svn/apr/libaprnw.mcp.zip
D svn/apr/libapr.dsp
D svn/apr/renames_pending
D svn/apr/time/win32/time.c
D svn/apr/time/win32/access.c
D svn/apr/time/win32/timestr.c
D svn/apr/time/win32
D svn/apr/time/unix/time.c
D svn/apr/time/unix/Makefile.in
D svn/apr/time/unix/timestr.c
D svn/apr/time/unix
D svn/apr/time
D svn/apr/passwd/Makefile.in
D svn/apr/passwd/apr_getpass.c
D svn/apr/passwd
D svn/apr/helpers/apr_rename.pl
D svn/apr/helpers
D svn/apr/images/ball2.png
D svn/apr/images/tip.png
D svn/apr/images/bug.gif
D svn/apr/images/ScanDocSmall.jpg
D svn/apr/images/caution.png
D svn/apr/images/warning.png
D svn/apr/images/master.gif
D svn/apr/images/ball1.gif
D svn/apr/images/tip.gif
D svn/apr/images/ball2.gif
D svn/apr/images/bug.png
D svn/apr/images/caution.gif
D svn/apr/images/warning.gif
D svn/apr/images/ScanDocBig.jpg
D svn/apr/images/ball1.png
D svn/apr/images/master.png
D svn/apr/images
D svn/apr/apr.dsp
D svn/apr/CHANGES
D svn/apr/memory/unix/apr_pools.c
D svn/apr/memory/unix/Makefile.in
D svn/apr/memory/unix
D svn/apr/memory
D svn/apr/tables/Makefile.in
D svn/apr/tables/apr_hash.c
D svn/apr/tables/apr_tables.c
D svn/apr/tables
D svn/apr/locks/win32/proc_mutex.c
D svn/apr/locks/win32/thread_rwlock.c
D svn/apr/locks/win32/thread_mutex.c
D svn/apr/locks/win32/thread_cond.c
D svn/apr/locks/win32
D svn/apr/locks/os2/Makefile.in
D svn/apr/locks/os2/proc_mutex.c
D svn/apr/locks/os2/thread_rwlock.c
D svn/apr/locks/os2/thread_mutex.c
D svn/apr/locks/os2/thread_cond.c
D svn/apr/locks/os2
D svn/apr/locks/unix/Makefile.in
D svn/apr/locks/unix/global_mutex.c
D svn/apr/locks/unix/proc_mutex.c
D svn/apr/locks/unix/thread_rwlock.c
D svn/apr/locks/unix/thread_mutex.c
D svn/apr/locks/unix/thread_cond.c
D svn/apr/locks/unix
D svn/apr/locks/netware/proc_mutex.c
D svn/apr/locks/netware/thread_rwlock.c
D svn/apr/locks/netware/thread_mutex.c
D svn/apr/locks/netware/thread_cond.c
D svn/apr/locks/netware
D svn/apr/locks/beos/Makefile.in
D svn/apr/locks/beos/proc_mutex.c
D svn/apr/locks/beos/thread_rwlock.c
D svn/apr/locks/beos/thread_mutex.c
D svn/apr/locks/beos/thread_cond.c
D svn/apr/locks/beos
D svn/apr/locks
D svn/apr/atomic/unix/apr_atomic.c
D svn/apr/atomic/unix/Makefile.in
D svn/apr/atomic/unix
D svn/apr/atomic/solaris_sparc/apr_atomic_sparc_no_support.c
D svn/apr/atomic/solaris_sparc/Makefile.in
D svn/apr/atomic/solaris_sparc/apr_atomic_sparc.s
D svn/apr/atomic/solaris_sparc
D svn/apr/atomic/netware/apr_atomic.c
D svn/apr/atomic/netware
D svn/apr/atomic/os390/Makefile.in
D svn/apr/atomic/os390/atomic.c
D svn/apr/atomic/os390
D svn/apr/atomic
D svn/apr/apr.dsw
D svn/apr/test/testtime.c
D svn/apr/test/Makefile.in
D svn/apr/test/testnames.c
D svn/apr/test/testshmconsumer.c
D svn/apr/test/occhild.c
D svn/apr/test/teststr.c
D svn/apr/test/testatomic.c
D svn/apr/test/testglobalmutex.c
D svn/apr/test/testtable.c
D svn/apr/test/testfileinfo.c
D svn/apr/test/internal/Makefile.in
D svn/apr/test/internal/testucs.c
D svn/apr/test/internal/testregex.c
D svn/apr/test/internal/Makefile
D svn/apr/test/internal
D svn/apr/test/testpipe.c
D svn/apr/test/aprtest.def
D svn/apr/test/testflock.c
D svn/apr/test/testsock.c
D svn/apr/test/nw_misc.c
D svn/apr/test/nwgnuproc_child
D svn/apr/test/testlockperf.c
D svn/apr/test/proc_child.c
D svn/apr/test/testvsn.c
D svn/apr/test/CuTest.c
D svn/apr/test/testsockets.c
D svn/apr/test/CuTest.h
D svn/apr/test/mod_test.c
D svn/apr/test/test_apr.h
D svn/apr/test/testprocmutex.c
D svn/apr/test/testshm.c
D svn/apr/test/testlock.c
D svn/apr/test/testenv.c
D svn/apr/test/Makefile.win
D svn/apr/test/sendfile.c
D svn/apr/test/testshmproducer.c
D svn/apr/test/testproc.c
D svn/apr/test/testthread.c
D svn/apr/test/client.c
D svn/apr/test/testdir.c
D svn/apr/test/testfile.c
D svn/apr/test/nwgnuaprtest
D svn/apr/test/testrand.c
D svn/apr/test/testdso.c
D svn/apr/test/testappnt.dsp
D svn/apr/test/testfmt.c
D svn/apr/test/data/mmap_datafile.txt
D svn/apr/test/data/file_datafile.txt
D svn/apr/test/data
D svn/apr/test/testdup.c
D svn/apr/test/testmmap.c
D svn/apr/test/testargs.c
D svn/apr/test/testpath.c
D svn/apr/test/MakeWin32Make.awk
D svn/apr/test/testoc.c
D svn/apr/test/server.c
D svn/apr/test/testpoll.c
D svn/apr/test/testud.c
D svn/apr/test/testall.c
D svn/apr/test/testsleep.c
D svn/apr/test/NWGNUmakefile
D svn/apr/test/testall.dsp
D svn/apr/test/README
D svn/apr/test/nwgnumod_test
D svn/apr/test/testuser.c
D svn/apr/test/testapp.c
D svn/apr/test/testipsub.c
D svn/apr/test/testsockopt.c
D svn/apr/test/testhash.c
D svn/apr/test/testall.dsw
D svn/apr/test/testapp.dsp
D svn/apr/test/aprtest.dsp
D svn/apr/test/aprtest.h
D svn/apr/test/testmutexscope.c
D svn/apr/test/testpools.c
D svn/apr/test/aprtest.dsw
D svn/apr/test/aprtest.win
D svn/apr/test
D svn/apr/network_io/win32/sockopt.c
D svn/apr/network_io/win32/sendrecv.c
D svn/apr/network_io/win32/sockets.c
D svn/apr/network_io/win32
D svn/apr/network_io/os2/inet_pton.c
D svn/apr/network_io/os2/inet_ntop.c
D svn/apr/network_io/os2/Makefile.in
D svn/apr/network_io/os2/sendrecv_udp.c
D svn/apr/network_io/os2/sockopt.c
D svn/apr/network_io/os2/os2calls.c
D svn/apr/network_io/os2/sendrecv.c
D svn/apr/network_io/os2/sockaddr.c
D svn/apr/network_io/os2/sockets.c
D svn/apr/network_io/os2
D svn/apr/network_io/unix/inet_pton.c
D svn/apr/network_io/unix/inet_ntop.c
D svn/apr/network_io/unix/Makefile.in
D svn/apr/network_io/unix/sockopt.c
D svn/apr/network_io/unix/sendrecv.c
D svn/apr/network_io/unix/sockaddr.c
D svn/apr/network_io/unix/sockets.c
D svn/apr/network_io/unix
D svn/apr/network_io/beos/socketcommon.c
D svn/apr/network_io/beos/Makefile.in
D svn/apr/network_io/beos/sendrecv.c
D svn/apr/network_io/beos
D svn/apr/network_io
D svn/apr/include/apr_thread_rwlock.h
D svn/apr/include/apr_mmap.h
D svn/apr/include/apr_ring.h
D svn/apr/include/apr_getopt.h
D svn/apr/include/apr_inherit.h
D svn/apr/include/apr_file_io.h
D svn/apr/include/apr_poll.h
D svn/apr/include/apr_portable.h
D svn/apr/include/apr_thread_cond.h
D svn/apr/include/apr_support.h
D svn/apr/include/apr_general.h
D svn/apr/include/apr_user.h
D svn/apr/include/apr_global_mutex.h
D svn/apr/include/apr_hash.h
D svn/apr/include/apr.h.in
D svn/apr/include/apr_proc_mutex.h
D svn/apr/include/arch/aix/apr_arch_dso.h
D svn/apr/include/arch/aix
D svn/apr/include/arch/win32/apr_arch_thread_cond.h
D svn/apr/include/arch/win32/apr_arch_misc.h
D svn/apr/include/arch/win32/apr_arch_threadproc.h
D svn/apr/include/arch/win32/apr_private.h
D svn/apr/include/arch/win32/apr_arch_atime.h
D svn/apr/include/arch/win32/apr_dbg_win32_handles.h
D svn/apr/include/arch/win32/apr_arch_networkio.h
D svn/apr/include/arch/win32/apr_arch_inherit.h
D svn/apr/include/arch/win32/apr_arch_dso.h
D svn/apr/include/arch/win32/apr_arch_proc_mutex.h
D svn/apr/include/arch/win32/apr_arch_utf8.h
D svn/apr/include/arch/win32/apr_arch_file_io.h
D svn/apr/include/arch/win32/apr_arch_thread_rwlock.h
D svn/apr/include/arch/win32/apr_arch_thread_mutex.h
D svn/apr/include/arch/win32
D svn/apr/include/arch/unix/apr_arch_internal_time.h
D svn/apr/include/arch/unix/apr_arch_thread_cond.h
D svn/apr/include/arch/unix/apr_arch_threadproc.h
D svn/apr/include/arch/unix/apr_arch_misc.h
D svn/apr/include/arch/unix/apr_arch_networkio.h
D svn/apr/include/arch/unix/apr_arch_global_mutex.h
D svn/apr/include/arch/unix/apr_private.h.in
D svn/apr/include/arch/unix/apr_arch_inherit.h
D svn/apr/include/arch/unix/apr_arch_dso.h
D svn/apr/include/arch/unix/apr_arch_proc_mutex.h
D svn/apr/include/arch/unix/apr_arch_file_io.h
D svn/apr/include/arch/unix/apr_arch_shm.h
D svn/apr/include/arch/unix/apr_arch_thread_rwlock.h
D svn/apr/include/arch/unix/apr_arch_thread_mutex.h
D svn/apr/include/arch/unix
D svn/apr/include/arch/os2/apr_arch_thread_cond.h
D svn/apr/include/arch/os2/apr_arch_threadproc.h
D svn/apr/include/arch/os2/apr_arch_networkio.h
D svn/apr/include/arch/os2/apr_arch_os2calls.h
D svn/apr/include/arch/os2/apr_arch_proc_mutex.h
D svn/apr/include/arch/os2/apr_arch_dso.h
D svn/apr/include/arch/os2/apr_arch_file_io.h
D svn/apr/include/arch/os2/apr_arch_thread_rwlock.h
D svn/apr/include/arch/os2/apr_arch_thread_mutex.h
D svn/apr/include/arch/os2
D svn/apr/include/arch/netware/apr_arch_thread_cond.h
D svn/apr/include/arch/netware/apr_arch_pre_nw.h
D svn/apr/include/arch/netware/apr_arch_internal_time.h
D svn/apr/include/arch/netware/apr_arch_threadproc.h
D svn/apr/include/arch/netware/apr_private.h
D svn/apr/include/arch/netware/apr_arch_networkio.h
D svn/apr/include/arch/netware/apr_arch_global_mutex.h
D svn/apr/include/arch/netware/apr_arch_dso.h
D svn/apr/include/arch/netware/apr_arch_proc_mutex.h
D svn/apr/include/arch/netware/apr_arch_file_io.h
D svn/apr/include/arch/netware/apr_arch_thread_rwlock.h
D svn/apr/include/arch/netware/apr_arch_thread_mutex.h
D svn/apr/include/arch/netware
D svn/apr/include/arch/beos/apr_arch_thread_cond.h
D svn/apr/include/arch/beos/apr_arch_threadproc.h
D svn/apr/include/arch/beos/apr_arch_proc_mutex.h
D svn/apr/include/arch/beos/apr_arch_dso.h
D svn/apr/include/arch/beos/apr_arch_thread_rwlock.h
D svn/apr/include/arch/beos/apr_arch_thread_mutex.h
D svn/apr/include/arch/beos
D svn/apr/include/arch/apr_private_common.h
D svn/apr/include/arch/os390/apr_arch_dso.h
D svn/apr/include/arch/os390
D svn/apr/include/arch
D svn/apr/include/apr_shm.h
D svn/apr/include/apr_env.h
D svn/apr/include/apr_strings.h
D svn/apr/include/apr_thread_mutex.h
D svn/apr/include/apr_thread_proc.h
D svn/apr/include/apr_file_info.h
D svn/apr/include/apr_pools.h
D svn/apr/include/apr_time.h
D svn/apr/include/apr_lib.h
D svn/apr/include/apr.hw
D svn/apr/include/apr_want.h
D svn/apr/include/apr_tables.h
D svn/apr/include/apr_atomic.h
D svn/apr/include/apr_signal.h
D svn/apr/include/apr_network_io.h
D svn/apr/include/apr_fnmatch.h
D svn/apr/include/apr_allocator.h
D svn/apr/include/apr_compat.h
D svn/apr/include/apr.hnw
D svn/apr/include/apr_dso.h
D svn/apr/include/apr_errno.h
D svn/apr/include/apr_version.h
D svn/apr/include
D svn/apr/dso/aix/Makefile.in
D svn/apr/dso/aix/dso.c
D svn/apr/dso/aix
D svn/apr/dso/win32/dso.c
D svn/apr/dso/win32
D svn/apr/dso/os2/Makefile.in
D svn/apr/dso/os2/dso.c
D svn/apr/dso/os2
D svn/apr/dso/unix/Makefile.in
D svn/apr/dso/unix/dso.c
D svn/apr/dso/unix
D svn/apr/dso/netware/dso.c
D svn/apr/dso/netware
D svn/apr/dso/beos/Makefile.in
D svn/apr/dso/beos/dso.c
D svn/apr/dso/beos
D svn/apr/dso/os390/Makefile.in
D svn/apr/dso/os390/dso.c
D svn/apr/dso/os390
D svn/apr/dso
D svn/apr/configure.in
D svn/apr/mmap/win32/mmap.c
D svn/apr/mmap/win32
D svn/apr/mmap/unix/Makefile.in
D svn/apr/mmap/unix/common.c
D svn/apr/mmap/unix/mmap.c
D svn/apr/mmap/unix
D svn/apr/mmap
D svn/apr/apr-config.in
D svn/apr/threadproc/win32/signals.c
D svn/apr/threadproc/win32/proc.c
D svn/apr/threadproc/win32/thread.c
D svn/apr/threadproc/win32/threadpriv.c
D svn/apr/threadproc/win32
D svn/apr/threadproc/os2/signals.c
D svn/apr/threadproc/os2/Makefile.in
D svn/apr/threadproc/os2/proc.c
D svn/apr/threadproc/os2/thread.c
D svn/apr/threadproc/os2/threadpriv.c
D svn/apr/threadproc/os2
D svn/apr/threadproc/unix/signals.c
D svn/apr/threadproc/unix/Makefile.in
D svn/apr/threadproc/unix/proc.c
D svn/apr/threadproc/unix/thread.c
D svn/apr/threadproc/unix/threadpriv.c
D svn/apr/threadproc/unix/procsup.c
D svn/apr/threadproc/unix
D svn/apr/threadproc/netware/signals.c
D svn/apr/threadproc/netware/proc.c
D svn/apr/threadproc/netware/thread.c
D svn/apr/threadproc/netware/threadpriv.c
D svn/apr/threadproc/netware/procsup.c
D svn/apr/threadproc/netware
D svn/apr/threadproc/beos/Makefile.in
D svn/apr/threadproc/beos/apr_proc_stub.c
D svn/apr/threadproc/beos/threadproc_common.c
D svn/apr/threadproc/beos/proc.c
D svn/apr/threadproc/beos/thread.c
D svn/apr/threadproc/beos/threadpriv.c
D svn/apr/threadproc/beos
D svn/apr/threadproc
D svn/apr/misc/win32/apr_app.c
D svn/apr/misc/win32/rand.c
D svn/apr/misc/win32/utf8.c
D svn/apr/misc/win32/env.c
D svn/apr/misc/win32/charset.c
D svn/apr/misc/win32/misc.c
D svn/apr/misc/win32/internal.c
D svn/apr/misc/win32/start.c
D svn/apr/misc/win32
D svn/apr/misc/os2/randbyte.c
D svn/apr/misc/os2
D svn/apr/misc/unix/Makefile.in
D svn/apr/misc/unix/getopt.c
D svn/apr/misc/unix/rand.c
D svn/apr/misc/unix/version.c
D svn/apr/misc/unix/otherchild.c
D svn/apr/misc/unix/errorcodes.c
D svn/apr/misc/unix/env.c
D svn/apr/misc/unix/charset.c
D svn/apr/misc/unix/start.c
D svn/apr/misc/unix
D svn/apr/misc/netware/apr.xdc
D svn/apr/misc/netware/rand.c
D svn/apr/misc/netware/aprlib.def
D svn/apr/misc/netware/libprews.c
D svn/apr/misc/netware/charset.c
D svn/apr/misc/netware/start.c
D svn/apr/misc/netware
D svn/apr/misc
D svn/apr/NWGNUmakefile
D svn/apr/acconfig.h
D svn/apr/build/install.sh
D svn/apr/build/prebuildNW.bat
D svn/apr/build/Makefile.in
D svn/apr/build/libtool.m4
D svn/apr/build/NWGNUhead.inc
D svn/apr/build/config.guess
D svn/apr/build/NWGNUenvironment.inc
D svn/apr/build/ltmain.sh
D svn/apr/build/config.sub
D svn/apr/build/nw_export.inc
D svn/apr/build/libapr_app.dsp
D svn/apr/build/win32ver.awk
D svn/apr/build/MakeEtags
D svn/apr/build/make_nw_export.awk
D svn/apr/build/aplibtool.c
D svn/apr/build/apr_app.dsp
D svn/apr/build/PrintPath
D svn/apr/build/apr_threads.m4
D svn/apr/build/get-version.sh
D svn/apr/build/cvtdsp.pl
D svn/apr/build/mkdir.sh
D svn/apr/build/NWGNUtail.inc
D svn/apr/build/nw_ver.awk
D svn/apr/build/make_exports.awk
D svn/apr/build/NWGNUmakefile
D svn/apr/build/find_apr.m4
D svn/apr/build/apr_rules.mk
D svn/apr/build/apr_hints.m4
D svn/apr/build/buildcheck.sh
D svn/apr/build/apr_rules.mk.in
D svn/apr/build/make_var_export.awk
D svn/apr/build/apr_common.m4
D svn/apr/build/apr_network.m4
D svn/apr/build/lineends.pl
D svn/apr/build/fixwin32mak.pl
D svn/apr/build
D svn/apr/configure.lineno
D svn/apr/buildconf
D svn/apr/poll/unix/Makefile.in
D svn/apr/poll/unix/poll.c
D svn/apr/poll/unix/pollacc.c
D svn/apr/poll/unix
D svn/apr/poll/os2/Makefile.in
D svn/apr/poll/os2/pollset.c
D svn/apr/poll/os2/poll.c
D svn/apr/poll/os2/pollacc.c
D svn/apr/poll/os2
D svn/apr/poll
D svn/apr/file_io/win32/flock.c
D svn/apr/file_io/win32/dir.c
D svn/apr/file_io/win32/filesys.c
D svn/apr/file_io/win32/open.c
D svn/apr/file_io/win32/readwrite.c
D svn/apr/file_io/win32/seek.c
D svn/apr/file_io/win32/filedup.c
D svn/apr/file_io/win32/filestat.c
D svn/apr/file_io/win32/filepath.c
D svn/apr/file_io/win32/pipe.c
D svn/apr/file_io/win32
D svn/apr/file_io/os2/flock.c
D svn/apr/file_io/os2/Makefile.in
D svn/apr/file_io/os2/open.c
D svn/apr/file_io/os2/copy.c
D svn/apr/file_io/os2/fullrw.c
D svn/apr/file_io/os2/filestat.c
D svn/apr/file_io/os2/filesys.c
D svn/apr/file_io/os2/dir.c
D svn/apr/file_io/os2/maperrorcode.c
D svn/apr/file_io/os2/fileacc.c
D svn/apr/file_io/os2/readwrite.c
D svn/apr/file_io/os2/seek.c
D svn/apr/file_io/os2/filedup.c
D svn/apr/file_io/os2/filepath_util.c
D svn/apr/file_io/os2/filepath.c
D svn/apr/file_io/os2/mktemp.c
D svn/apr/file_io/os2/pipe.c
D svn/apr/file_io/os2
D svn/apr/file_io/unix/flock.c
D svn/apr/file_io/unix/Makefile.in
D svn/apr/file_io/unix/open.c
D svn/apr/file_io/unix/copy.c
D svn/apr/file_io/unix/filestat.c
D svn/apr/file_io/unix/fullrw.c
D svn/apr/file_io/unix/dir.c
D svn/apr/file_io/unix/fileacc.c
D svn/apr/file_io/unix/readwrite.c
D svn/apr/file_io/unix/seek.c
D svn/apr/file_io/unix/filedup.c
D svn/apr/file_io/unix/filepath_util.c
D svn/apr/file_io/unix/filepath.c
D svn/apr/file_io/unix/pipe.c
D svn/apr/file_io/unix/mktemp.c
D svn/apr/file_io/unix
D svn/apr/file_io/netware/filesys.c
D svn/apr/file_io/netware/flock.c
D svn/apr/file_io/netware/filestat.c
D svn/apr/file_io/netware/filepath.c
D svn/apr/file_io/netware/pipe.c
D svn/apr/file_io/netware
D svn/apr/file_io
D svn/apr/shmem/win32/shm.c
D svn/apr/shmem/win32
D svn/apr/shmem/os2/Makefile.in
D svn/apr/shmem/os2/shm.c
D svn/apr/shmem/os2
D svn/apr/shmem/unix/Makefile.in
D svn/apr/shmem/unix/shm.c
D svn/apr/shmem/unix
D svn/apr/shmem/beos/Makefile.in
D svn/apr/shmem/beos/shm.c
D svn/apr/shmem/beos
D svn/apr/shmem
D svn/apr/README.dev
D svn/apr/support/unix/Makefile.in
D svn/apr/support/unix/waitio.c
D svn/apr/support/unix
D svn/apr/support
D svn/apr/user/win32/groupinfo.c
D svn/apr/user/win32/userinfo.c
D svn/apr/user/win32
D svn/apr/user/unix/Makefile.in
D svn/apr/user/unix/groupinfo.c
D svn/apr/user/unix/userinfo.c
D svn/apr/user/unix
D svn/apr/user/netware/groupinfo.c
D svn/apr/user/netware/userinfo.c
D svn/apr/user/netware
D svn/apr/user
D svn/apr
D svn/apr
svn: Unmergeable scheduling requested on an entry
svn: Can not add 'svn/apr/apr' to a parent directory scheduled for deletion

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 16 09:51:53 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.