Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/imerge.py @ 5154:ec24bfd852ab
imerge: simplify 1d5ebb0d366f
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 13 Aug 2007 11:58:47 -0700 |
parents | 1d5ebb0d366f |
children | 8860f29447c1 |
line wrap: on
line diff
--- a/hgext/imerge.py +++ b/hgext/imerge.py @@ -36,7 +36,7 @@ class ImergeStateFile(object): tf = tarfile.open(source, 'r') contents = tf.getnames() # tarfile normalizes path separators to '/' - statusfile = '/'.join(['.hg', 'imerge', 'status']) + statusfile = '.hg/imerge/status' if statusfile not in contents: raise InvalidStateFileException('no status file')