On Tue, Apr 22, 2008 at 11:09:39AM -0400, Karl Fogel wrote:
> > However, the difference between receiving deletion in repository and
> > folding local wc directory should still be taken into account. The
> > flag 'D' is traditionally used to represent deletion that is (or will)
> > reflected in repository. However, I currently expect a 'D ' output in
> > the test cases even if the deletion happens only in local wc when
> > folding. This deserves a second thought. Moreover, when making
> > modified items unversioned rather than removed in this test case, I
> > still use the 'D' flag in expected_output. I doubt if it is a proper
> > way. Do we need to introduce a new flag for this?
>
> I think we can just do it silently, exactly the way 'update' would.
I manually checked the output of svn up again. Update will notify each
item deleted in repository with a 'D'. An item of kind directory represent the
whole sub-tree rooted at it. So the expected_output in my folding test case
should be tuned accordingly, a single 'D' should be enough.
Let's check it a second time, the 'D' is ok for even local deletion that is
not reflected in repository.
>
> The real challenge will come when we unfold such a directory tree back
> to a deeper depth. Then will we get "obstructed path" errors, when
> preserved modified files are re-versioned?
Then, the situation is degenerated to a solved situation. The --force option
is already prepared for this situation -- the modified file will be
re-versioned as local modification. I've tested this and verified that it
works well with --set-depth option, at least for a simple situation. So I
didn't bother to include it in the test case (In fact, the modification to
A/mu was original prepared for this test).
Rui, Guo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-23 05:58:03 CEST