From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17258 invoked by alias); 19 Mar 2008 05:41:34 -0000 Received: (qmail 17250 invoked by uid 22791); 19 Mar 2008 05:41:33 -0000 X-Spam-Check-By: sourceware.org Received: from qb-out-0506.google.com (HELO qb-out-0506.google.com) (72.14.204.238) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 19 Mar 2008 05:40:49 +0000 Received: by qb-out-0506.google.com with SMTP id e6so208317qbe.2 for ; Tue, 18 Mar 2008 22:40:46 -0700 (PDT) Received: by 10.142.241.10 with SMTP id o10mr1606094wfh.27.1205905245893; Tue, 18 Mar 2008 22:40:45 -0700 (PDT) Received: by 10.142.201.6 with HTTP; Tue, 18 Mar 2008 22:40:45 -0700 (PDT) Message-ID: <4aca3dc20803182240m32f65325ua78993e9773fd5f2@mail.gmail.com> Date: Wed, 19 Mar 2008 10:06:00 -0000 From: "Daniel Berlin" To: "Ben Elliston" Subject: Re: svn problems with the gcc tree Cc: overseers In-Reply-To: <1205904581.32064.2.camel@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1205904581.32064.2.camel@localhost> Mailing-List: contact overseers-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: overseers-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00161.txt.bz2 You have svn added a file that already appears to exist in the repository. SVN tries to add it. This fails miserably, since it already exists (and thus, should be modified, not added). This happens if you did an svnmerge on a client that wasn't updated to the latest branch revision. On Wed, Mar 19, 2008 at 1:29 AM, Ben Elliston wrote: > I hope this is the right place to report problems with svn in the GCC > tree. I discovered a handful of files that were not merged into my > branch by svnmerge. I figured I would bring them over by just copying > them and svn adding them. However, on checkin, I get errors like this: > > svn: File already exists: filesystem '/svn/gcc/db', transaction '133334-1', path '/branches/named-addr-spaces-branch/libstdc++-v3/doc/Makefile.in' > > Any ideas? > > Thanks, Ben > > >