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 5B9D2910D for ; Thu, 2 Feb 2012 10:28:24 +0000 (UTC) Received: (qmail 79923 invoked by uid 500); 2 Feb 2012 10:28:14 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 79109 invoked by uid 500); 2 Feb 2012 10:27:56 -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 79082 invoked by uid 99); 2 Feb 2012 10:27:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 10:27:54 +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 (nike.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; Thu, 02 Feb 2012 10:27:45 +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 q12ARPAe002540 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Thu, 2 Feb 2012 11:27:25 +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; Thu, 2 Feb 2012 11:27:25 +0100 From: Markus Schaber To: "Subversion Users (users@subversion.apache.org)" Subject: AW: Problem with reverting Thread-Topic: Problem with reverting Thread-Index: Aczg9aaKa7Dj6oYMREmnMwXISz0c1wABrWmAACDWNrAAAcGNgAADVk/Q Date: Thu, 2 Feb 2012 10:27:23 +0000 Message-ID: <727D8E16AE957149B447FE368139F2B50D7237AE@SERVER10> References: <727D8E16AE957149B447FE368139F2B50D722563@SERVER10> <20120201171257.GH16977@ted.stsp.name> <727D8E16AE957149B447FE368139F2B50D72374C@SERVER10> <20120202094327.GB23501@ted.stsp.name> In-Reply-To: <20120202094327.GB23501@ted.stsp.name> 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 X-Virus-Checked: Checked by ClamAV on apache.org Hi, Stefan, Von: Stefan Sperling [mailto:stsp@elego.de]=20 > On Thu, Feb 02, 2012 at 08:24:47AM +0000, Markus Schaber wrote: > > I did create issue http://subversion.tigris.org/issues/show_bug.cgi?id= =3D4109 for this case. > Thanks! > > My personal wish would be that operations like revert and commit work=20 > > for all constellations even with "--depth=3Dempty" if we explicitly=20 > > mention all affected files and directories, > That can be done. It requires reworking how the 'revert' operation in lib= svn_wc processes its arguments. We'd need to pass it a list, rather than a = single path and adapt the code to handle this properly. > This implies an API change so it can only be done for 1.8. Maybe it's a task I could try to "attack" on the Hackathon. > > and that "--depth=3Dfiles" recreates the files when reverting a=20 > > directory > You mean reverting individual files independently of their parent directo= ry? Not sure if this does or would work. In theory is could work. I'm not sure what you mean with "independently of their parent directory". In case of the re-ordered arguments, the revert operation first reverted th= e added file foo/bar, and then reverted the added and tree-conflicted direc= tory foo. But despite the fact that "--depth=3Dfiles" was given, the revert= did leave the incoming foo/bar marked as deleted, instead of reverting it = when reverting foo/. Here's the example, executing the two revert operations independently, usin= g a copy of the same working copy: D:\TreeConflict\ef3sok5h.vc4.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 D:\TreeConflict\ef3sok5h.vc4.svnwc>svn revert "Device\Plc Logic\Application= \Library Manager\svnobj" Reverted 'Device\Plc Logic\Application\Library Manager\svnobj' D:\TreeConflict\ef3sok5h.vc4.svnwc>svn status R C Device\Plc Logic\Application\Library Manager > local add, incoming add upon update D Device\Plc Logic\Application\Library Manager\svnobj Summary of conflicts: Tree conflicts: 1 D:\TreeConflict\ef3sok5h.vc4.svnwc>svn revert --depth=3Dfiles "Device\Plc L= ogic\Application\Library Manager" Reverted 'Device\Plc Logic\Application\Library Manager' D:\TreeConflict\ef3sok5h.vc4.svnwc>svn status D Device\Plc Logic\Application\Library Manager\svnobj Here, I'd expect the second revert operation to recreate the svnobj file. But maybe this problem is a different problem than the other problem. 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