Mercurial > hg > mercurial-crew-with-dirclash

changeset 5153:1d5ebb0d366f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: fix status file lookups
author Patrick Mezard <pmezard@gmail.com>
date Mon, 13 Aug 2007 19:42:52 +0200
parents b51d07ed1b18
children ec24bfd852ab
files hgext/imerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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')