Hi, Stefan, Von: Stefan Sperling [mailto:s...@elego.de] > 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=4109 > > for this case.
> Thanks! > > My personal wish would be that operations like revert and commit work > > for all constellations even with "--depth=empty" if we explicitly > > mention all affected files and directories, > That can be done. It requires reworking how the 'revert' operation in > libsvn_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=files" recreates the files when reverting a > > directory > You mean reverting individual files independently of their parent directory? > 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 the added file foo/bar, and then reverted the added and tree-conflicted directory foo. But despite the fact that "--depth=files" 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, using 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=files "Device\Plc Logic\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 -- ___________________________ 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.scha...@3s-software.com | Web: http://www.3s-software.com CoDeSys internet forum: http://forum.3s-software.com Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915