Only in duplicity-0.6.15: .duplicity.swp Only in duplicity-0.6.15: a Only in duplicity-0.6.15: build diff -ru a/duplicity-0.6.15/src/patchdir.py duplicity-0.6.15/src/patchdir.py --- a/duplicity-0.6.15/src/patchdir.py 2011-08-19 20:26:58.000000000 +0200 +++ duplicity-0.6.15/src/patchdir.py 2011-10-06 17:29:13.000000000 +0200 @@ -459,6 +459,7 @@ """Apply the patches in patch_seq, return single ropath""" first = patch_seq[0] assert first.difftype != "diff", patch_seq + print "after normalize_ps():", repr(patch_seq) if not first.isreg(): # No need to bother with data if not regular file assert len( patch_seq ) == 1, len( patch_seq ) @@ -491,6 +492,7 @@ """ collated = collate_iters( iter_list ) for patch_seq in collated: + print "before normalize_ps():", repr(patch_seq) final_ropath = patch_seq2ropath( normalize_ps( patch_seq ) ) if final_ropath.exists(): # otherwise final patch was delete diff -ru a/duplicity-0.6.15/src/path.py duplicity-0.6.15/src/path.py --- a/duplicity-0.6.15/src/path.py 2011-08-19 20:26:58.000000000 +0200 +++ duplicity-0.6.15/src/path.py 2011-10-06 15:51:58.000000000 +0200 @@ -460,7 +460,7 @@ def __repr__(self): """Return string representation""" - return "(%s %s)" % (self.index, self.type) + return "(%s %s difftype=%s)" % (self.index, self.type, getattr(self, "difftype", None)) class Path(ROPath):