"Eric S. Raymond" <esr@thyrsus.com> writes:
> Turns out there's an existing FAQ item this fits under.
Applied (tweaked) in r10883. Thanks!
-Karl
> Index: project_faq.html
> ===================================================================
> --- project_faq.html (revision 10870)
> +++ project_faq.html (working copy)
> @@ -1428,10 +1428,29 @@
> working copy is out of date?</a></h3>
>
> <p>
> -When you commit, Subversion bumps the revision numbers of all nodes the commit
> -touches. This means that in a single folder, the files and folders might
> -be at different revisions, depending on when you last committed them.</p>
> +There are at least two kinds of situation that can cause this. One
> +involves debris from a failed commit; the other can be triggered by
> +the presence of mixed revisions in a working copy.</p>
> <p>
> +You may have had a commit that went sour between the time the new revision
> +was added in the server and the time your client performed its
> +post-commit admin tasks (including refreshing your local text-base
> +copy). This might happen for various reasons including (rarely)
> +problems in the database back end or (more commonly) network dropouts
> +at exactly the wrong time.</p>
> +<p>
> +If this happens, it's possible that you have already committed the very
> +changes you are trying now to commit. Try reverting again, and then
> +running 'svn update'. Only 'svn update' refreshes the text-base; a
> +revert doesn't do that.
> +<p>
> +Occasionally you may see this error without a failed commit in the
> +recent past. When you commit, the Subversion client only bumps the revision
> +numbers of all nodes the commit touches (not of all nodes). This
> +means that in a single working copy, the files and subdirectories
> +might be at different revisions, depending on when you last committed
> +them.</p>
> +<p>
> For certain operations (deletes and property modifications), if the repository
> has a more recent version of the node, the commit will be rejected, to prevent
> data loss.</p>
> @@ -1442,7 +1461,8 @@
> Version Control with Subversion
> for details.</p>
> <p>
> -To prevent this error, simply update your working copy using:</p>
> +In either case, you can clean up this error by updating your working
> +copy using:</p>
>
> <pre>
> svn update working-copy
> --
> Eric S. Raymond
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 10 20:40:17 2004