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

#

     3

# An example CGI script to use hgweb, edit as necessary

     4

     5

import cgitb, os, sys

     6

# sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install

     7

from mercurial import hgweb

     8

     9

h = hgweb.hgweb("/path/to/repo", "repository name")

    10

h.run()