Mercurial > hg > mercurial-crew-with-dirclash
view convert-repo @ 146:4a828422247d
Handle merge with deletions
If you merge with a repo that has deleted a file after editing it, hg
attempted to resolve the file. This (correctly) resulted in hg verify
errors because the resolved version didn't show up in the manifests.
This moves the manifest resolution before file resolution and decides
which files to resolve based on the (partially) resolved manifest.
After files are resolved, the final manifest is committed.
author | mpm@selenic.com |
---|---|
date | Tue, 24 May 2005 20:30:35 -0800 |
parents | 2c80f6f8fc08 |
children |
line wrap: on
line source
#!/usr/bin/env python import sys, os, sha, base64, re from mercurial import hg ui = hg.ui() repo = hg.repository(ui=ui) known = {} def encodepath(path): s = sha.sha(path).digest() s = base64.encodestring(s)[:-3] s = re.sub("\+", "%", s) s = re.sub("/", "_", s) return s for i in range(repo.changelog.count()): n = repo.changelog.node(i) changes = repo.changelog.read(n) for f in changes[3]: known[f] = 1 try: os.mkdir(".hg/data-new") except: pass files = known.keys() files.sort() for f in files: pb = ".hg/data/" + encodepath(f) pn = ".hg/data-new/" + f print f try: file(pn+".i", "w").write(file(pb+"i").read()) except: os.makedirs(os.path.dirname(pn)) # we actually copy the files to get nice disk layout file(pn+".i", "w").write(file(pb+"i").read()) file(pn+".d", "w").write(file(pb).read()) os.rename(".hg/data", ".hg/data-old") os.rename(".hg/data-new", ".hg/data")