On Wed, Mar 15, 2006 at 08:36:03AM -0600, kfogel@collab.net wrote:
> Julian Foad <julianfoad@btopenworld.com> writes:
> > (A schedule-delete item should behave locally as if it were already
> > deleted. In fact, the main text IS already deleted, and the properties
> > should be too. They aren't restored by "revert", of course, so there's
> > no reason to keep them at all.)
>
> Can you clarify what you mean by "they aren't restored by 'revert', of
> course, so there's no reason to keep them at all"? The main text is
> restored by 'revert'... By the way, try this:
>
BASE is restored by 'revert', but local modifications are discarded.
> $ svn delete some-versioned-file.txt
> $ svn st -q
> D some-versioned-file.txt
> $ svn cat some-versioned-file.txt
>
> You may be surprised by the results :-).
>
I asked about 'cat'; Julian wrote:
# Well, 'svn cat' is a bit unsure of itself. It prints what I can only assume
# is the base version of the file (even if I implement and specify a "-rWC"
# option). Its help doesn't say whether it's supposed to be printing the base
# version. It seems there's both a clarification (in the help) and a bug fix
# (in svn_client_cat) required.
> Also, if the working file was in a modified state at deletion time,
> then it remains present on disk. Should the analogous thing happen
> with properties?
>
Um, no it doesn't, at least not in 1.3.0. 'svn rm' refuses to run, and
'svn rm --force' deletes the target.
IMO, the only commands that should succeed with a schedule-deleted file as
target are 'status', 'revert', 'commit', and 'info'. I guess that 'diff',
'update', 'merge', 'switch', and 'unlock' could be argued to be useful,
but I don't see that the others are.
(Oh, 'add', 'copy' and 'move' should work with the deleted file as a
target, but that's not quite the same thing).
Regards,
Malcolm
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 15 18:13:06 2006