For 'undelete' in svn, we do the following:
> svn rm bic4 > svn commit -m 'Test delete' Deleting bic4/schematic Committed revision 6 > svn merge --change -6 . --- Reverse-merging r6 into '.': A bic4 A bic4/schematic A bic4/schematic/thumbnail_128x128.png A bic4/schematic/master.tag A bic4/schematic/data.dm A bic4/schematic/sch.oa --- Recording mergeinfo for reverse merge of r6 into '.': U . --- Eliding mergeinfo from '.': U . (The last two messages are new in 1.7) create a targets file containing: bic4 bic4/schematic bic4/schematic/thumbnail_128x128.png bic4/schematic/master.tag bic4/schematic/data.dm bic4/schematic/sch.oa and commit the changes: > svn commit --targets=<file> -m 'Undelete bic4' This works in svn 1.6, but fails in svn 1.7 with the following message: svn: E200009: Commit failed (details follow): svn: E200009: '<path>/bic4/schematic' is not under version control and is not part of the commit, yet its child '<path>/bic4/schematic/sch.oa' is part of the commit I can workaround this by changing the contents of the target file but this looks like a bug, because 'bic4/schematic' is in the targets file. Thanks, fergus
