Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: fix status file lookups
authorPatrick Mezard <pmezard@gmail.com>
Mon, 13 Aug 2007 19:42:52 +0200
changeset 5164 1d5ebb0d366f
parent 5163 b51d07ed1b18
child 5165 ec24bfd852ab
imerge: fix status file lookups
hgext/imerge.py file | annotate | diff | comparison | revisions 
--- a/hgext/imerge.py	Mon Aug 13 19:42:52 2007 +0200
+++ b/hgext/imerge.py	Mon Aug 13 19:42:52 2007 +0200
@@ -35,7 +35,8 @@
 
         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')
Mercurial