Mercurial > hg > mercurial-crew-with-dirclash
view rewrite-log @ 1072:05dc7aba22eb
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
author | mpm@selenic.com |
---|---|
date | Fri, 26 Aug 2005 16:49:23 -0700 |
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")