[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] depth test case: unversioned & modified items left untouched when folded

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 22 Apr 2008 11:09:39 -0400

"Rui, Guo" <timmyguo_at_mail.ustc.edu.cn> writes:
>> But in your working copy, you've modified A/D/G/pi, and created an
>> unversioned file at A/D/H/unversioned.txt. When the update arrives, it
>> will remove everything else, but it will leave the modified file and the
>> unversioned file, and it will (of course) leave parent directories in
>> place as necessary to reach those remaining items.
> Emmm. I admit that I didn't considered this situation. It's very
> similar with the situation here. So don't bother to interfere with the
> --force option since we already chose not to do so in a similar situation.

Exactly -- I agree.

>> That is the behavior I was proposing here: we should fold up all
>> versioned and unmodified stuff, but leave behind anything unversioned or
>> modified (and therefore leave the intermediate directories necessary to
>> reach those items).
> Yes, I got your idea even you didn't used a proper example. ;)

Thanks :-).

> 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.

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?

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-22 17:09:56 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.