hgext/imerge.py
changeset 5153 1d5ebb0d366f
parent 5117 d4fa6bafc43a
child 5154 ec24bfd852ab
--- a/hgext/imerge.py
+++ b/hgext/imerge.py
@@ -35,7 +35,8 @@ class ImergeStateFile(object):
 
         tf = tarfile.open(source, 'r')
         contents = tf.getnames()
-        statusfile = os.path.join('.hg', 'imerge', 'status')
+        # tarfile normalizes path separators to '/'
+        statusfile = '/'.join(['.hg', 'imerge', 'status'])
         if statusfile not in contents:
             raise InvalidStateFileException('no status file')