[Checkins] SVN: z3c.vcsync/trunk/ Do not try to re-remove files
that were already removed (apparently)
Martijn Faassen
faassen at infrae.com
Tue Feb 19 13:54:54 EST 2008
Log message for revision 84062:
Do not try to re-remove files that were already removed (apparently)
by SVN.
Changed:
U z3c.vcsync/trunk/CHANGES.txt
U z3c.vcsync/trunk/src/z3c/vcsync/vc.py
-=-
Modified: z3c.vcsync/trunk/CHANGES.txt
===================================================================
--- z3c.vcsync/trunk/CHANGES.txt 2008-02-19 16:41:33 UTC (rev 84061)
+++ z3c.vcsync/trunk/CHANGES.txt 2008-02-19 18:54:54 UTC (rev 84062)
@@ -4,8 +4,13 @@
0.11 (unreleased)
-----------------
-* ...
+Bugs fixed
+~~~~~~~~~~
+* Do not try to remove non-existent files during synchronization. A
+ file might have been removed in SVN and there is no more need to
+ re-remove it if it was also removed locally.
+
0.10 (2008-01-08)
-----------------
Modified: z3c.vcsync/trunk/src/z3c/vcsync/vc.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/vc.py 2008-02-19 16:41:33 UTC (rev 84061)
+++ z3c.vcsync/trunk/src/z3c/vcsync/vc.py 2008-02-19 18:54:54 UTC (rev 84062)
@@ -123,7 +123,8 @@
# well and gone though, as we don't want them to reappear in
# the ZODB when we do a load.
for to_remove in self._to_remove:
- py.path.local(to_remove).remove(rec=True)
+ if to_remove.exists():
+ py.path.local(to_remove).remove(rec=True)
# store what was removed and modified in checkout now
files_removed = self.checkout.removed(revision_nr)
files_changed = self.checkout.files(revision_nr)
More information about the Checkins
mailing list