diff options
| author | Georg Brandl <georg@python.org> | 2008-12-05 09:00:55 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-12-05 09:00:55 (GMT) |
| commit | 5c7f8fb7fd020c9a30a8e6de7a480fbd27bec63a (patch) | |
| tree | 80af91ea62897e0571ce7b0b761b1d3e7fab3cc2 /Tools/scripts/svneol.py | |
| parent | f917e86b89cb179982dbf7d15b42edc0ee6902d4 (diff) | |
| download | cpython-5c7f8fb7fd020c9a30a8e6de7a480fbd27bec63a.zip cpython-5c7f8fb7fd020c9a30a8e6de7a480fbd27bec63a.tar.gz cpython-5c7f8fb7fd020c9a30a8e6de7a480fbd27bec63a.tar.bz2 | |
Merged revisions 67398,67423-67424,67432,67440-67441,67444-67445,67454,67457,67463 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67398 | benjamin.peterson | 2008-11-26 18:39:17 +0100 (Wed, 26 Nov 2008) | 1 line
fix typo in sqlite3 docs
........
r67423 | jesse.noller | 2008-11-28 19:59:35 +0100 (Fri, 28 Nov 2008) | 2 lines
issue4238: bsd support for cpu_count
........
r67424 | christian.heimes | 2008-11-28 20:33:33 +0100 (Fri, 28 Nov 2008) | 1 line
Retain copyright of processing examples. This was requested by a Debian maintainer during packaging of the multiprocessing package for 2.4/2.5
........
r67432 | benjamin.peterson | 2008-11-29 00:18:46 +0100 (Sat, 29 Nov 2008) | 1 line
SVN format 9 is the same it seems
........
r67440 | jeremy.hylton | 2008-11-29 00:42:59 +0100 (Sat, 29 Nov 2008) | 4 lines
Move definition int sval into branch of ifdef where it is used.
Otherwise, you get a warning about an undefined variable.
........
r67441 | jeremy.hylton | 2008-11-29 01:09:16 +0100 (Sat, 29 Nov 2008) | 2 lines
Reflow long lines.
........
r67444 | amaury.forgeotdarc | 2008-11-29 03:03:32 +0100 (Sat, 29 Nov 2008) | 2 lines
Fix a small typo in docstring
........
r67445 | benjamin.peterson | 2008-11-30 04:07:33 +0100 (Sun, 30 Nov 2008) | 1 line
StringIO.close() stops you from using the buffer, too
........
r67454 | benjamin.peterson | 2008-11-30 15:43:23 +0100 (Sun, 30 Nov 2008) | 1 line
note the version that works
........
r67457 | christian.heimes | 2008-11-30 22:16:28 +0100 (Sun, 30 Nov 2008) | 1 line
w# requires Py_ssize_t
........
r67463 | skip.montanaro | 2008-12-01 02:55:22 +0100 (Mon, 01 Dec 2008) | 1 line
typo in comment
........
Diffstat (limited to 'Tools/scripts/svneol.py')
| -rw-r--r-- | Tools/scripts/svneol.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/scripts/svneol.py b/Tools/scripts/svneol.py index 9e57bb4..9357c7e 100644 --- a/Tools/scripts/svneol.py +++ b/Tools/scripts/svneol.py @@ -39,9 +39,9 @@ def propfiles(root, fn): format = int(open(os.path.join(root, ".svn", "format")).read().strip()) except IOError: return [] - if format == 8: - # In version 8, committed props are stored in prop-base, - # local modifications in props + if format in (8, 9): + # In version 8 and 9, committed props are stored in prop-base, local + # modifications in props return [os.path.join(root, ".svn", "prop-base", fn+".svn-base"), os.path.join(root, ".svn", "props", fn+".svn-work")] raise ValueError, "Unknown repository format" |