/breezy-svn/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-svn/trunk

« back to all changes in this revision

Viewing changes to reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2020-01-31 19:40:01 UTC
  • Revision ID: jelmer@jelmer.uk-20200131194001-ri4z8wyq0cvymo20
More python3/breezy compat fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
                try:
71
71
                    old_mapping = mapping.find_mapping_fileprops(
72
72
                        revmeta.get_changed_fileprops())
73
 
                except SubversionException, (_, ERR_FS_NOT_DIRECTORY):
74
 
                    num_changed += self._set_skip_revprop(revnum, revprops)
75
 
                    continue
 
73
                except SubversionException as e:
 
74
                    if e.args[1] == ERR_FS_NOT_DIRECTORY:
 
75
                        num_changed += self._set_skip_revprop(revnum, revprops)
 
76
                        continue
 
77
                    raise
76
78
                if old_mapping is None:
77
79
                    num_changed += self._set_skip_revprop(revnum, revprops)
78
80
                    continue