Author: danielsh
Date: Tue Jun 7 12:22:31 2011
New Revision: 1132971
URL: http://svn.apache.org/viewvc?rev=1132971&view=rev
Log:
Follow-up to r1104192: report the correct format number for 1.7 working copies.
* tools/dev/wc-format.py
(get_format): Try .svn/wc.db before .svn/entries.
Modified:
subversion/trunk/tools/dev/wc-format.py
Modified: subversion/trunk/tools/dev/wc-format.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-format.py?rev=1132971&r1=1132970&r2=1132971&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-format.py (original)
+++ subversion/trunk/tools/dev/wc-format.py Tue Jun 7 12:22:31 2011
@@ -29,13 +29,13 @@ def get_format(wc_path):
formatno = 'not under version control'
- if os.path.exists(entries):
- formatno = int(open(entries).readline())
- elif os.path.exists(wc_db):
+ if os.path.exists(wc_db):
conn = sqlite3.connect(wc_db)
curs = conn.cursor()
curs.execute('pragma user_version;')
formatno = curs.fetchone()[0]
+ elif os.path.exists(entries):
+ formatno = int(open(entries).readline())
elif os.path.exists(wc_path):
parent_path = os.path.dirname(os.path.abspath(wc_path))
if wc_path != parent_path:
