[djames@svn2 trunk]$ svn commit Sending build/generator/gen_make.py Sending build/generator/gen_win.py Sending build/generator/swig/__init__.py Adding build/generator/swig/checkout_swig_header.py Sending build.conf svn: Commit failed (details follow): svn: Your file or directory 'build.conf' is probably out-of-date svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit). svn: Your commit message was left in a temporary file: svn: '/home/djames/trunk/svn-commit.tmp' [djames@svn2 trunk]$ svn up G build.conf U subversion/bindings/swig/include/svn_containers.swg U subversion/bindings/swig/svn_ra.i U subversion/bindings/swig/python/tests/wc.py U subversion/bindings/swig/python/tests/ra.py U subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c U subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h U subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c U subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java U subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp U subversion/bindings/javahl/native/SVNClient.h U subversion/bindings/javahl/native/SVNClient.cpp U subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java U subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java U subversion/libsvn_ra/wrapper_template.h U subversion/libsvn_ra/ra_loader.c U subversion/libsvn_fs_util/mergeinfo-sqlite-index.c U subversion/include/svn_error_codes.h U subversion/include/svn_fs.h U subversion/include/svn_mergeinfo.h U subversion/include/svn_repos.h U subversion/include/svn_wc.h U subversion/include/svn_client.h U subversion/include/private/svn_fs_private.h U subversion/libsvn_wc/merge.c U subversion/libsvn_wc/props.c U subversion/libsvn_wc/copy.c U subversion/libsvn_wc/status.c U subversion/libsvn_wc/update_editor.c U subversion/libsvn_subr/io.c U subversion/libsvn_subr/mergeinfo.c U subversion/libsvn_client/switch.c U subversion/libsvn_client/externals.c U subversion/libsvn_client/client.h U subversion/libsvn_client/merge.c U subversion/libsvn_client/copy.c U subversion/libsvn_client/commit.c U subversion/svnlook/main.c U subversion/libsvn_ra_serf/serf.c U subversion/libsvn_ra_serf/update.c U subversion/libsvn_ra_serf/commit.c U subversion/libsvn_ra_neon/merge.c U subversion/libsvn_ra_neon/props.c U subversion/libsvn_ra_neon/ra_neon.h U subversion/libsvn_ra_neon/commit.c U subversion/libsvn_ra_neon/lock.c U subversion/libsvn_ra_neon/fetch.c U subversion/libsvn_ra_neon/util.c U subversion/mod_dav_svn/dav_svn.h U subversion/mod_dav_svn/repos.c U subversion/tests/libsvn_fs/fs-test.c U subversion/tests/libsvn_subr/mergeinfo-test.c U subversion/tests/cmdline/log_tests.py U subversion/tests/cmdline/svnlook_tests.py U subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout U subversion/tests/cmdline/svntest/main.py U subversion/tests/cmdline/merge_tests.py U subversion/libsvn_repos/log.c U subversion/libsvn_repos/rev_hunt.c U subversion/svn/cl.h U subversion/svn/switch-cmd.c U subversion/svn/notify.c U subversion/svn/import-cmd.c U subversion/svn/conflict-callbacks.c U subversion/svn/main.c U subversion/libsvn_fs_fs/fs_fs.c U subversion/libsvn_fs_fs/fs.h U subversion/libsvn_fs_fs/structure U subversion/libsvn_fs_fs/lock.c U subversion/po/fr.po U subversion/po/it.po D build/generator/swig/checkout_swig_header.py U www/project_tools.html U www/merge-tracking/index.html U www/mailing-list-guidelines.html U www/build-farm.html U COMMITTERS U notes/sparse-directories.txt A notes/dump-load-format.txt U notes/merge-tracking.txt U notes/fs_dumprestore.txt U notes/tree-conflicts.txt U contrib/client-side/svnmerge/svnmerge_test.py U contrib/client-side/svnmerge/svnmerge.py U contrib/client-side/emacs/psvn.el D tools/test-scripts U tools/client-side/bash_completion A tools/buildbot A tools/buildbot/slaves A tools/buildbot/slaves/xp-vc60-ia32 A tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl A tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat A tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat A tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat A tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat A tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32 A tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh A tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh A tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh A tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh A tools/buildbot/slaves/win32-xp VS2005 A tools/buildbot/slaves/win32-xp VS2005/do_all.bat A tools/buildbot/slaves/win32-xp VS2005/svncheck.bat A tools/buildbot/slaves/win32-xp VS2005/config.bat A tools/buildbot/slaves/win32-xp VS2005/svnbuild.bat A tools/buildbot/slaves/win32-xp VS2005/svnlog.bat A tools/buildbot/slaves/win32-xp VS2005/svnclean.bat A tools/buildbot/slaves/i686-debian-sarge1 A tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh A tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh A tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh A tools/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c A tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh A tools/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c A tools/buildbot/slaves/README U tools/xslt/svnindex.xsl D doc/user/svn-ref.tex U . Updated to revision 25876. [djames@svn2 trunk]$ svn commit -F svn-commit.tmp Sending build/generator/gen_make.py Sending build/generator/gen_win.py Sending build/generator/swig/__init__.py Sending build.conf Transmitting file data .... Committed revision 25877. [djames@svn2 trunk]$ svn --version svn, version 1.5.0 (dev build) compiled Jul 14 2007, 10:15:11 Copyright (C) 2000-2007 CollabNet. Subversion is open source software, see http://subversion.tigris.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). The following repository access (RA) modules are available: * ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme [djames@svn2 trunk]$ uname -a Linux svn2.sjc.collab.net 2.6.9-42.ELsmp #1 SMP Wed Jul 12 23:27:17 EDT 2006 i686 i686 i386 GNU/Linux