hg resolve: merge a given node into the working directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg resolve: merge a given node into the working directory This is the first pass at working directory-based merges. Doing a resolve adds a second parent to the working directory state for the next commit. manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC kkfoAxX2E5jkuOeSJ1Hjalk= =bdrT -----END PGP SIGNATURE-----

     1

#!/usr/bin/env python

     2

import sys, os

     3

from mercurial import hg

     4

     5

f = sys.argv[1]

     6

     7

r1 = hg.revlog(open, f + ".i", f + ".d")

     8

r2 = hg.revlog(open, f + ".i2", f + ".d2")

     9

    10

tr = hg.transaction(open, "journal")

    11

    12

for i in xrange(r1.count()):

    13

    n = r1.node(i)

    14

    p1, p2 = r1.parents(n)

    15

    l = r1.linkrev(n)

    16

    t = r1.revision(n)

    17

    n2 = r2.addrevision(t, tr, l, p1, p2)

    18

tr.close()

    19

    20

os.rename(f + ".i", f + ".i.old")

    21

os.rename(f + ".d", f + ".d.old")

    22

os.rename(f + ".i2", f + ".i")

    23

os.rename(f + ".d2", f + ".d")