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

Re: svn commit: r22940 - in trunk/subversion: include libsvn_client libsvn_wc svn tests/cmdline

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2007-01-11 01:59:50 CET

On Wed, Jan 10, 2007 at 06:05:22PM -0500, David Glasser wrote:
> >> " 1. Each item specified by a PATH is scheduled for deletion
> >upon\n"
> >> " the next commit. Files, and directories that have not been\n"
> >> - " committed, are immediately removed from the working copy.\n"
> >> + " committed, are immediately removed from the working copy\n"
> >> + " unless --keep-local option is given.\n"
> >> " PATHs that are, or contain, unversioned or modified items
> >will\n"
> >> " not be removed unless the --force option is given.\n"
> >> "\n"
> >> " 2. Each item specified by a URL is deleted from the
> >repository\n"
> >> " via an immediate commit.\n"),
> >
> >This is incorrect: it implies that --keep-local only works for uncommitted
> >(schedule-add) directories.
>
> How about inverting it:
>
> Unless the --keep-local option is given, files are immediately
> removed from the working copy, as are directories that have not
> been committed.
>

Still not great, I'm afraid: 'svn rm normal-dir/' will delay removing the
directory until commit, while 'svn rm file' and 'svn rm schedule-add-dir/'
will remove the targets immediately.

'svn rm --keep-local versioned-dir/' and 'svn rm --keep-local file'
will not remove the targets at all, even on commit. Perhaps we should
separate this paragraph out into scheduling and removal, then note the
delayed removal of schedule-normal directories afterwards?

[You'll notice I didn't mention what 'svn rm --keep-local
schedule-add-dir/' should do. If I'm reading it right, the comments
imply that it'll get deleted immediately, though I'm not sure if that's
what actually happens. Either way, something needs fixing.]

Regards,
Malcolm

  • application/pgp-signature attachment: stored
Received on Thu Jan 11 02:00:00 2007

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