I just got bitten by some strange revert bug. Apparently it leaves
'copyfrom' args in my entries file, even though the entry isn't
scheduled for addition anymore. And this prevents future updates.
Here's a perfect recipe, using our repository. It's exactly how I
discovered the bug. Shall I file an issue?
[sussman@BenBook:~/scratch]$ svn co -r12813
http://svn.collab.net/repos/svn/branches/locking/www
A www/release-history.html
A www/testing-goals.html
A www/subversion_logo-200x173.png
A www/subversion-diagram.png
A www/project_footer.html
A www/project_tools.html
A www/subversion_logo_hor-468x64.png
A www/svn-sscanf-advisory.txt
A www/favicon.ico
A www/subversion_logo-384x332.png
A www/bitmover-svn.html
A www/bindings.html
A www/logo
A www/logo/subversion_logo.eps
A www/logo/subversion_logo.ai
A www/project_issues.html
A www/images
A www/images/bsddaemon.png
A www/images/debian.jpg
A www/images/suse.png
A www/images/mandrake.png
A www/images/win32.png
A www/images/src-pkg.png
A www/images/sol7logo.gif
A www/images/redhat.png
A www/cvs_help.html
A www/subversion-diagram.graffle
A www/project_packages.html
A www/project_links.html
A www/inconveniences.html
A www/project_development.html
A www/project_status.html
A www/propaganda.html
A www/db42-support-patch.txt
A www/project_header.html
A www/mailing-list-guidelines.html
A www/getting_subversion.html
A www/cvs-changelog.html
A www/roadmap.html
A www/robots.txt
A www/variance-adjusted-patching.html
A www/project_faq.html
A www/svn_1.1_releasenotes.html
A www/security
A www/security/CAN-2004-0749-advisory.txt
A www/security/mod_authz_svn-copy-advisory.txt
A www/security/CAN-2004-0413-advisory.txt
A www/index.html
A www/security.html
A www/project_license.html
A www/_template.html
A www/webdav-usage.html
A www/project_tasks.html
U www
Checked out revision 12813.
[sussman@BenBook:~/scratch]$
[sussman@BenBook:~/scratch]$ cd www
[sussman@BenBook:~/scratch/www]$ svn merge -r12758:12813
http://svn.collab.net/repos/svn/trunk/www
U project_tools.html
U project_issues.html
U project_links.html
U inconveniences.html
A faq.html
U mailing-list-guidelines.html
U getting_subversion.html
D project_faq.html
A project_faq.html
U index.html
[sussman@BenBook:~/scratch/www]$
[sussman@BenBook:~/scratch/www]$ svn st
M project_tools.html
M project_issues.html
M inconveniences.html
M project_links.html
A + faq.html
M mailing-list-guidelines.html
M getting_subversion.html
R + project_faq.html
M index.html
[sussman@BenBook:~/scratch/www]$
[sussman@BenBook:~/scratch/www]$ svn revert -R .
Reverted 'project_tools.html'
Reverted 'project_issues.html'
Reverted 'inconveniences.html'
Reverted 'project_links.html'
Reverted 'faq.html'
Reverted 'mailing-list-guidelines.html'
Reverted 'getting_subversion.html'
Reverted 'project_faq.html'
Reverted 'index.html'
[sussman@BenBook:~/scratch/www]$
[sussman@BenBook:~/scratch/www]$ svn st
? faq.html
[sussman@BenBook:~/scratch/www]$ rm faq.html
[sussman@BenBook:~/scratch/www]$ svn st
[sussman@BenBook:~/scratch/www]$ svn up
subversion/libsvn_ra_dav/util.c:681: (apr_err=160013)
svn: REPORT request failed on '/repos/svn/!svn/vcc/default'
subversion/libsvn_ra_dav/util.c:365: (apr_err=160013)
svn: Working copy path 'project_faq.html' does not exist in repository
[sussman@BenBook:~/scratch/www]$ cat .svn/entries
[...]
<entry
committed-rev="12812"
name="project_faq.html"
text-time="2005-01-22T17:25:15.000000Z"
committed-date="2005-01-21T20:33:50.117405Z"
checksum="8011260a9cb1ef33df2ed20ebd402a9e"
copied="true"
last-author="kfogel"
kind="file"
copyfrom-rev="12813"
prop-time="2005-01-22T17:25:22.000000Z"
revision="0"
copyfrom-url="http://svn.collab.net/repos/svn/trunk/www/
project_faq.html"/>
[...]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jan 22 18:29:57 2005