This is the mail archive of the
mailing list for the GCC project.
Re: Overwrite a file with "svn update"?
- From: "Giovanni Bajo" <giovannibajo at libero dot it>
- To: "Steve Kargl" <sgk at troutmask dot apl dot washington dot edu>
- Cc: <gcc at gcc dot gnu dot org>
- Date: Sat, 19 Nov 2005 21:00:38 +0100
- Subject: Re: Overwrite a file with "svn update"?
- References: <20051119150235.GA69104@troutmask.apl.washington.edu>
Steve Kargl <firstname.lastname@example.org> wrote:
> Perhaps, I missed the required options, but I'll
> ask an obvious question anyway. Often when testing
> a patch, one will often place a new testcase in
> gcc/testsuite/*. This new file is not under control
> of svn. After review, the patch is committed to the
> tree. Now, I want to update my local repository.
> I issue "svn update" and the result is
> svn: Failed to add file 'gcc/testsuite/gfortran.dg/fgetc_1.f90': \
> object of the same name already exists
> which is indeed correct. So, is there an option to tell
> svn to blow away files that conflict with files in the
Why don't you just "svn add" the file? So you won't miss it in the commit, in
the diffs, in the stats, and whatnot. "svn add" is a totally local operation
and does not require write access to the remote repository. You can even do
that on a tree checked out with svn:// and later switch the tree to svn+ssh://
to commit it.