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

Re: Merging and switching

From: Jay Freeman \(saurik\) <saurik_at_saurik.com>
Date: 2002-01-25 12:21:26 CET

That isn't what "update" is about... if that were the case, when you did an
update you would remove all local changes to the working copy, including
those to files that _are_ on the server (as having those changes obviously
makes this NOT an "exact copy"). When you do an update, you are taking the
changes that were made between your revision and another revision (most
often the HEAD), and merging them in with your possibly modified local copy.
I can't imagine a situation where I would want to delete all of the changes
I've made (including adding new files and directories) to my repository...
are you sure you aren't looking for a clean checkout?

Sincerely,
Jay Freeman (saurik)
saurik@saurik.com

----- Original Message -----
From: "Geisser, Oliver" <O.Geisser@CEYONIQ.COM>
To: <dev@subversion.tigris.org>
Sent: Friday, January 25, 2002 3:16 AM
Subject: RE: Merging and switching

> Hi
>
...
> >
> > No -- the difference is that the parent doesn't have an entry for
> > subdir "apr/". Yes, there is a seperately checked out svn/apr
> > directory, but svn/.svn/entries doesn't know or care about it.
>
> This brings me to a question:
>
> Will/should subversion delete files/directories it does not know about ?
>
> On the one hand side I want subversion to take care to manage all my
files.
> If I say "update" I want to have an exact copy of the repository.
> This implies that there are no additional files/directories hanging
around.
>
> One the other side "sometimes" I want this extra file/directory to stay.
> Like in the example with the svn/apr directory. Subversion does not know
> about it
> (no info in .svn/entries) but I do not want subversion to delete it.
>
> But most of the time I want subversion to delete this "unknown" files to
> make
> sure that there is no "garbage" hanging around.
>
> How is this currently handled and what is the plan for the future ?
>
> Thanks.
>
> -og

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:59 2006

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.