This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Overwrite a file with "svn update"?


On Sat, Nov 19, 2005 at 11:29:36AM -0800, Jim Blandy wrote:
> On 11/19/05, Steve Kargl <sgk@troutmask.apl.washington.edu> wrote:
> > which is indeed correct.  So, is there an option to tell
> > svn to blow away files that conflict with files in the
> > repository.
> 
> Subversion is reluctant to blow away users' files; this was one of the
> qualities of CVS we thought we should try to retain.

I believe if the file is in a cvs repository and the copy
in your local tree was not obtained via a checkout, cvs
will replace the local file with whatever is in the repository.

> However, if I'm understanding it right, here Subversion is hesitating
> to replace a file with a file of the same name whose contents are the
> same.  Is that correct?

Yes.

> Has the file in your local repository been added with 'svn add'?

No.

> Or is it an unknown file from Subversion's point of view?

Yes.


The scenario is:

Committer1:  I have a patch with a new file that needs review.
Committer2:  Grabs patch and put everything in local tree to review.
Committer2:  Does not use "svn add" or any other svn command.
Committer2:  Finishes review and tells committer1 to check patch in.
Committer1:  Commits patch
Committer2:  Now wants to update his local repository.  Files conflict.

-- 
Steve


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]