Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E0775105BA for ; Fri, 20 Feb 2015 08:40:23 +0000 (UTC) Received: (qmail 58822 invoked by uid 500); 20 Feb 2015 08:40:23 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 58789 invoked by uid 500); 20 Feb 2015 08:40:23 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 58777 invoked by uid 99); 20 Feb 2015 08:40:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Feb 2015 08:40:23 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of stefan@egosoft.com designates 81.169.159.190 as permitted sender) Received: from [81.169.159.190] (HELO deepth.de) (81.169.159.190) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Feb 2015 08:40:16 +0000 Received: from b2b-130-180-18-42.unitymedia.biz ([130.180.18.42] helo=[192.168.3.127]) by deepth.de with esmtpa (Exim 4.72) (envelope-from ) id 1YOj7A-0005Hw-R4 for users@subversion.apache.org; Fri, 20 Feb 2015 09:39:12 +0100 Message-ID: <54E6F2B0.3090505@egosoft.com> Date: Fri, 20 Feb 2015 09:39:12 +0100 From: Stefan Hett User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: users@subversion.apache.org Subject: Re: svn: E155011 "out of date" error and svn: E160020 "already exists" error References: <205830976.2890006.1424364951367.JavaMail.yahoo@mail.yahoo.com> In-Reply-To: <205830976.2890006.1424364951367.JavaMail.yahoo@mail.yahoo.com> Content-Type: multipart/alternative; boundary="------------020901070508020709000402" X-Virus-Checked: Checked by ClamAV on apache.org This is a multi-part message in MIME format. --------------020901070508020709000402 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi James, the error sounds to me as if the file you wanted to add was already commited. Did you try svn up before svn commit? Regards, Stefan > > I renamed a package (folder name) and then renamed two files under it > (the renamed folder). Then I use kdesvn to do commit which will add > and then commit, I think. I got the attached error. Then I tried the > following command line commands but no luck: svn up --force theFolder, > svn commit -m "messages" > . > Is there a way to fix it or I have to checkout a fresh copy and copy > over the existing one? > > I am using svn 1.8.10 under Fedora 20. > > thanks, > James > > > $ svn commit -m "rename scmgmt package to exmgmt" > Adding com/uiapp/exmgmt/ExMgmtMgr.java > svn: E155011: Commit failed (details follow): > svn: E155011: File > '/home//0-workspace/OC/trunk/latest/src/com/uiapp/exmgmt/ExMgmtMgr.java' > is out of date > svn: E160020: File 'com/uiapp/exmgmt/ExMgmtMgr.java' already exists > > --------------020901070508020709000402 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit

Hi James,

the error sounds to me as if the file you wanted to add was already commited.
Did you try svn up before svn commit?

Regards,
Stefan

I renamed a package (folder name) and then renamed two files under it (the renamed folder). Then I use kdesvn to do commit which will add and then commit, I think. I got the attached error. Then I tried the following command line commands but no luck: svn up --force theFolder, svn commit -m "messages"
.

Is there a way to fix it or I have to checkout a fresh copy and copy over the existing one?

I am using svn 1.8.10 under Fedora 20.

thanks,

James

$ svn commit -m "rename scmgmt package to exmgmt"
Adding com/uiapp/exmgmt/ExMgmtMgr.java
svn: E155011: Commit failed (details follow):
svn: E155011: File '/home//0-workspace/OC/trunk/latest/src/com/uiapp/exmgmt/ExMgmtMgr.java' is out of date
svn: E160020: File 'com/uiapp/exmgmt/ExMgmtMgr.java' already exists

--------------020901070508020709000402--