# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1187026972 -7200
# Node ID 1d5ebb0d366fdfa1fc353dfcd1f25e0254e06a55
# Parent  b51d07ed1b18d2c1b0f6eff31033ca220702b296
imerge: fix status file lookups

diff --git a/hgext/imerge.py b/hgext/imerge.py
--- 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')