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

Re: svn rm empty-dir fails

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-08-23 03:45:56 CEST

Rene Rebe <rene.rebe@gmx.net> writes:

> Philip Martin <philip@codematters.co.uk> wrote:
>
>> Rene Rebe <rene.rebe@gmx.net> writes:
>>
>> > svn mv A/test B/
>> > svn commit -m "the move breaking some mod-time?"
>>
>> This commit creates a new revision of A in the repository, and makes A
>> out-of-date in your working copy.
>
> Why does it need to make A out-of-date?

That question was answered below.

> It was HEAD before - and should so after the commit, shouldn't it?

In general the working copy is not HEAD, it certainly wasn't in your
case as you had committed an add in A and had not run update.

[...]

>> - One may commit an add in an out-of-date directory provided the item
>> added does not conflict with an item in the HEAD version of the
>> directory.
>>
>> - One may commit a delete of an item from an out-of-date directory
>> provided the item being deleted is up-to-date.
>
> Couldn't the same "provided the item deleted does not conflict with an
> item in the HEAD version of the directory" apply, as it does for adds
> above?

The general principle we used was that 'svn commit' should not delete
information that was not present in the working copy.

>> - Neither of the above cause the working copy directory to get
>> updated. To do otherwise would require commits to be able to add,
>> and delete, items in the working copy.
>
> Sure.

That is the answer to your first question.

>> - One cannot commit a delete of an out-of-date directory. To do so
>> would allow one to delete items one did not know existed.
>
> The questions are: Does the directory really need to be out-of-date in
> this case?

The general principle about deleting information applies.

> And can't the same "no conflict rule" as for adds seems to apply be
> used here?

The rule for adds is simple, one cannot add an item "foo" if an item
called "foo" already exists. It would be more complicated for
deletes, it would involve comparing two revisions of "foo" and making
some sort of decision about whether they are "the same".

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 23 03:46:50 2003

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.