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 9C499904A for ; Wed, 1 Feb 2012 15:27:45 +0000 (UTC) Received: (qmail 97568 invoked by uid 500); 1 Feb 2012 15:27:44 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 97498 invoked by uid 500); 1 Feb 2012 15:27:44 -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 97490 invoked by uid 99); 1 Feb 2012 15:27:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 15:27:43 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [213.182.0.52] (HELO mail-a.speedkom.net) (213.182.0.52) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 15:27:37 +0000 Received: from SERVER10.in.3s-software.com (pat-out.3s-software.com [213.182.7.179]) by mail-a.speedkom.net with ESMTP id q11FRE4b020504 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 1 Feb 2012 16:27:14 +0100 Received: from SERVER10.in.3s-software.com ([192.168.100.4]) by SERVER10 ([192.168.100.4]) with mapi id 14.01.0355.002; Wed, 1 Feb 2012 16:27:14 +0100 From: Markus Schaber To: "Subversion Users (users@subversion.apache.org)" Subject: Problem with reverting Thread-Topic: Problem with reverting Thread-Index: Aczg9aaKa7Dj6oYMREmnMwXISz0c1w== Date: Wed, 1 Feb 2012 15:27:13 +0000 Message-ID: <727D8E16AE957149B447FE368139F2B50D722563@SERVER10> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.101.12] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Hi, I have a directory foo with tree conflict: local add of foo and a file foo/= bar, and then an update trying to add the same foo and foo/bar. Now, I try = to revert using SharpSVN, which internally calls svn_client_revert_2(). I g= ive the path of the directory and the file, and a depth of "files". Then I = get the Exception Can't revert 'C:\Users\{...}\foo' without reverting child= ren", SVN_ERR_WC_INVALID_OPERATION_DEPTH.=20 I can reproduce that on the command line, getting the additional hint that = I should use --depth=3D"infinity" instead. That seems to indicate that reve= rts of added directories always need --depth=3D"infinity", despite the fact= that all existing children are also mentioned in the argument list. C:\{...}\svnwc>svn status R C Device\Plc Logic\Application\Library Manager > local add, incoming add upon update A Device\Plc Logic\Application\Library Manager\svnobj Summary of conflicts: Tree conflicts: 1 C:\{...}\svnwc>svn revert --depth=3Dfiles "Device\Plc Logic\Application\Lib= rary Manager" "Device\Plc Logic\Application\Library Manager\svnobj" svn: E155038: Try 'svn revert --depth infinity' instead? svn: E155038: Can't revert 'C:\{...}\svnwc\Device\Plc Logic\Application\Lib= rary Manager' without r everting children The strange thing is that if I change the order of arguments, it works with= out errors, but misses to restore the "svnobj" file from the repository, ma= rking it as "deleted" - despite the fact that both --depth=3Dfiles and the = file's path are given on the command line. C:\{...}\svnwc>svn revert --depth=3Dfiles "Device\Plc Logic\Application\Lib= rary Manager\svnobj" "Dev ice\Plc Logic\Application\Library Manager" Reverted 'Device\Plc Logic\Application\Library Manager\svnobj' Reverted 'Device\Plc Logic\Application\Library Manager'I'm using the latest= SharpSVN build 1.7002.2011, and command line 1.7.2 (r1207936) C:\{...}\svnwc>svn status D Device\Plc Logic\Application\Library Manager\svnobj I guess that this was the reason why I initially sorted the arguments to re= vert by "parents first"... I always thought of operations like "revert" or "commit" to work on a set o= f input files, where the order of arguments is not important, but this seem= s to be wrong :-( Best regards Markus Schaber --=20 ___________________________ We software Automation. 3S-Smart Software Solutions GmbH Markus Schaber | Developer Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax += 49-831-54031-50 Email: m.schaber@3s-software.com | Web: http://www.3s-software.com=20 CoDeSys internet forum: http://forum.3s-software.com Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sa= mple_projects Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade= register: Kempten HRB 6186 | Tax ID No.: DE 167014915=20