Mercurial > hg > mercurial-crew-with-dirclash
view rewrite-log @ 226:1536ccac47e9
merge: don't bail on outstanding changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: don't bail on outstanding changes
With multiple heads, we don't need to worry about the working dir's
uncommitted changes at pull time
manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy
CysB458dNcFuB/vDFhgJr58=
=gG+u
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:45:04 -0800 |
parents | 5f471a75d607 |
children |
line wrap: on
line source
#!/usr/bin/env python import sys, os from mercurial import hg f = sys.argv[1] r1 = hg.revlog(open, f + ".i", f + ".d") r2 = hg.revlog(open, f + ".i2", f + ".d2") tr = hg.transaction(open, "journal") for i in xrange(r1.count()): n = r1.node(i) p1, p2 = r1.parents(n) l = r1.linkrev(n) t = r1.revision(n) n2 = r2.addrevision(t, tr, l, p1, p2) tr.close() os.rename(f + ".i", f + ".i.old") os.rename(f + ".d", f + ".d.old") os.rename(f + ".i2", f + ".i") os.rename(f + ".d2", f + ".d")