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

Re: When to merge sparse-directories branch to trunk?

From: Michael Brouwer <mb.7766_at_gmail.com>
Date: 2007-02-12 23:53:09 CET

On 2/2/07, Karl Fogel <kfogel@red-bean.com> wrote:
>
>
> Could you describe this in more detail? I'm okay with walking away from
> the new code, if there's a simpler way to do this. (I admit, I wish
> someone
> had brought it up when we posted the spec, back in September or October,
> but that's the way it goes sometimes :-) .)

The way it works is. You do a checkout with the -N flag, or you do a full
checkout and manually rm -rf any subtrees you are not interested in right
now.

svk update will never recreate a subdir (or file) you deleted this way. The
only way to get back a file or dir that is missing (or was never checked
out) is by using svk revert. By default revert will only give you the top
level object you are reverting. If you want a whole subtree add the -R
switch.

svk status shows you any missing files/subdirs with '!' unless you pass it
the -q switch in which case no '!" nor '?' files are shown.

There's no mode in which you can have the missing directories as empty
> subdirs, and then expand them, right? Oh, but you don't need that,
> because you see them whenever you do 'svn st', they're prefixed with "!".
> Hmmm. That's a bit scary -- it implies an error when there isn't one.
> The user requested that things be this way, whereas "!" usually means
> something is wrong. On the other hand, maybe that's an interface
> detail that could be tweaked.

In svk '!' simply means a file or directory which is under version control
is missing from your working copy. This is actually exactly what is
happening when you checkout a partial tree.

Can you bring a subdir back in -N mode itself, though?

Yes, svk revert subdir (without -R) will bring back just subdir itself.

Michael
Received on Mon Feb 12 23:53:24 2007

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