You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Brian Denny <br...@briandenny.net> on 2003/05/07 05:27:32 UTC
Re: [Issue 854] Changed - svn revert . in a directory scheduled for addition breaks working copy
On Wed, May 07, 2003 at 02:35:24AM -0000, issues@subversion.tigris.org wrote:
> + ------- Additional Comments From rooneg@tigris.org 2003-05-06 19:35 PDT -------
> + just wanted to note that something has changed recently that changes the
> + behavior of this case. as of revision 5825, the final 'svn up' runs to
> + completion, and the directory that was added then reverted shows up as
> + being deleted:
[snip]
this sounds like it could have been a result of my 'fix' for 1075
(r5814), unless you know that it was 5825 itself...
there will be a followup to r5816 just as soon as i have time to look at it
(see http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=36495);
i'll check this out and see if i think r5814 'broke' something (else) in
this use case that i should fix.
-brian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Issue 854] Changed - svn revert . in a directory scheduled for addition breaks working copy
Posted by Brian Denny <br...@briandenny.net>.
On Tue, May 06, 2003 at 10:27:32PM -0700, Brian Denny wrote:
> On Wed, May 07, 2003 at 02:35:24AM -0000, issues@subversion.tigris.org wrote:
> > + ------- Additional Comments From rooneg@tigris.org 2003-05-06 19:35 PDT -------
> > + just wanted to note that something has changed recently that changes the
> > + behavior of this case. as of revision 5825, the final 'svn up' runs to
> > + completion, and the directory that was added then reverted shows up as
> > + being deleted:
>
> [snip]
>
> this sounds like it could have been a result of my 'fix' for 1075
> (r5814), unless you know that it was 5825 itself...
I've looked into this, and a summary of what i found is:
- the change in behavior is due to r5814.
- AFAICT it's not relevant to the *fix* for Issue 854.
Details:
The gist of r5814 was that the cleanup after an update will go through
and remove entries for any missing directories, on the assumption that
they should have been dealt with during the update. A missing directory
in this case is a directory that has an entry in the parent directory's
entries file, but isn't on disk.
Except, that's not quite how i wrote it -- i wrote it to test for
missing using svn_wc__adm_missing, which means that the directory is
considered missing if it doesn't have an administrative area.
This may be the wrong way to do it (and there are further problems with
r5814 as well), but I think (based on the comments in IZ) that Issue 854's
fix will happen in the 'revert' operation, so this isn't really relevant.
-brian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org