NOTE: This patch has been committed. The version below is informational only (whitespace differences have been removed). ChangeLog addition: 2004-08-24 Didier Verna <didier@lrde.epita.fr> * prcs2svn/prcs.py (diff): Properly detect depopulated symlinks, and schedule them for deletion: don't assume that identical PRCS keys means same file in case of symlinks. lrde-tools source patch: Diff command: svn diff --diff-cmd /usr/bin/diff -x "-u -t -b -B -w" Files affected: prcs2svn/prcs.py Index: prcs2svn/prcs.py =================================================================== --- prcs2svn/prcs.py (revision 84) +++ prcs2svn/prcs.py (working copy) @@ -423,8 +423,13 @@ deleted_p = True for j in prj.files: if i[0] == j[0] or \ - (len(i[1]) > 0 and len(j[1]) > 0 and i[1][0] == j[1][0]): - # same name or same key + (len(i[1]) > 0 and len(j[1]) > 0 and i[1][0] == j[1][0] \ + and (len(i) < 3 or i[2] != ":symlink" \ + or len(j) < 3 or j[2] != ":symlink")): + # #### WARNING: identical symbolic links have the same key (since it + # is the name of the pointed file). Hence we can't deduce that it's a + # renaming. -- dvl + # same name or same key (except for symlinks) deleted_p = False break if deleted_p: -- Didier Verna, didier@lrde.epita.fr, http://www.lrde.epita.fr/~didier EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85 94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier@xemacs.org