##// END OF EJS Templates
imerge: fix status file lookups
Patrick Mezard -
r5164:1d5ebb0d default
parent child Browse files
Show More
@@ -35,7 +35,8 b' class ImergeStateFile(object):'
35
35
36 tf = tarfile.open(source, 'r')
36 tf = tarfile.open(source, 'r')
37 contents = tf.getnames()
37 contents = tf.getnames()
38 statusfile = os.path.join('.hg', 'imerge', 'status')
38 # tarfile normalizes path separators to '/'
39 statusfile = '/'.join(['.hg', 'imerge', 'status'])
39 if statusfile not in contents:
40 if statusfile not in contents:
40 raise InvalidStateFileException('no status file')
41 raise InvalidStateFileException('no status file')
41
42
General Comments 0
You need to be logged in to leave comments. Login now