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 05F12CA2D for ; Tue, 2 Jul 2013 14:06:25 +0000 (UTC) Received: (qmail 47149 invoked by uid 500); 2 Jul 2013 14:06:24 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 47127 invoked by uid 500); 2 Jul 2013 14:06:24 -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 47120 invoked by uid 99); 2 Jul 2013 14:06:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 14:06:23 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: local policy) Received: from [81.167.36.150] (HELO asav4.lyse.net) (81.167.36.150) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 14:06:17 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by asav4.lyse.net (Postfix) with ESMTP id 87CA06C1D8 for ; Tue, 2 Jul 2013 16:05:36 +0200 (CEST) X-Virus-Scanned: amavisd-new at lyse.net Received: from [192.168.0.100] (84-52-220.156.3p.ntebredband.no [84.52.220.156]) by asav4.lyse.net (Postfix) with ESMTP id C668C6C1D2 for ; Tue, 2 Jul 2013 16:05:35 +0200 (CEST) Message-ID: <51D2DE30.4080703@online.no> Date: Tue, 02 Jul 2013 16:05:36 +0200 From: Gunnar Dalsnes User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: users@subversion.apache.org Subject: Re: svn 1.8.0 problem "both sides of the move must be committed together" References: <51D2D17F.7040800@online.no> <20130702133340.GL17484@ted.stsp.name> In-Reply-To: <20130702133340.GL17484@ted.stsp.name> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org On 02.07.2013 15:33, Stefan Sperling wrote: > On Tue, Jul 02, 2013 at 03:11:27PM +0200, Gunnar Dalsnes wrote: >> Hi, >> >> When I try to commit I get: >> >> svn: E200009: Commit failed (details follow): >> svn: E200009: Cannot commit 'E:\svn\fishtalk trunk\src\VPA >> Framework\VPAEntities >> \Wrasse\BLEWrasseContainer.cs' because it was moved to >> 'E:\svn\fishtalk trunk\sr >> c\Plugins\Registration\BLEntities\Wrasse\BLEWrasseContainer.cs' >> which is not par >> t of the commit; both sides of the move must be committed together >> >> This is strange, because I correctly moved the files with TSVN 1.8.0 >> using "SVN Move versioned item(s) here". Tried commiting from both >> TSVN and from command line with svn.exe and same error. >> >> When I check with svn status I get this: >> >> A src\Plugins\Registration\IBLPWrasse\Entities >> A + src\Plugins\Registration\IBLPWrasse\Entities\BLEWrasseContainer.cs >> D src\VPA Framework\VPAEntities\Wrasse\BLEWrasseContainer.cs >> > moved to >> src\Plugins\Registration\BLEntities\Wrasse\BLEWrasseContainer.cs >> >> This seems to confirms that I moved the file correctly. > > Strange. The status output only shows one side of the move. > Where does it show a 'moved from'? Did you accidentally omit > the '> moved from' line from the output you pasted? There is no > moved from line showing for BLEWrasseContainer.cs in svn status. > >> Update: I finally managed to commit by only selecting the deleted >> source file, added destination file and added destination folder >> (ignoring all other changed): >> >> Command: Commit >> Adding: E:\svn\Copy of fishtalk >> trunk\src\Plugins\Registration\IBLPWrasse\Entities >> Adding: E:\svn\Copy of fishtalk >> trunk\src\Plugins\Registration\IBLPWrasse\Entities\BLEWrasse.cs >> Deleting: E:\svn\Copy of fishtalk trunk\src\VPA >> Framework\VPAEntities\Wrasse\BLEWrasse.cs >> Sending content: E:\svn\Copy of fishtalk >> trunk\src\Plugins\Registration\IBLPWrasse\Entities\BLEWrasse.cs >> Completed: At revision: 24489 >> >> Still, very annoying. This can't be right. > > It looks like you moved a file BLEWrasse.cs into a locally added folder > called Entities. To commit the move destination you also need to commit > the new folder that contains the move destination. I don't really > understand what you think is wrong that. Am I missing something? Sorry, I was confused, this is a different and unrelated file. This file actually has a > moved from entry, that's why it worked. > > >