Mercurial > hg > mercurial-crew-with-dirclash
annotate hgweb.cgi @ 407:0e0d0670b2bc
[PATCH] Merging identical changes from another branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging identical changes from another branch
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
The issue comes up when a local uncommitted *new* file (i.e. not in the
current manifest) is being merged with an identical file from a branch.
Since the file is not in the current manifest (it's either in the
current "to-be-added" list, or in the "unknown" state), there's no
(local) node from which to create a mergepoint.
manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01
92uuMswZXcoCchQAaxew7C0=
=qRsk
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 18:41:57 -0800 |
| parents | 5f65a108a559 |
| children | d0db3462d568 |
| rev | line source |
|---|---|
| 202 | 1 #!/usr/bin/env python |
| 159 | 2 # |
| 3 # An example CGI script to use hgweb, edit as necessary | |
| 4 | |
| 5 import cgitb, os, sys | |
|
391
5f65a108a559
hgweb: pull cgitb into CGI script example, where it can easily be disabled
mpm@selenic.com
parents:
202
diff
changeset
|
6 cgitb.enable() |
|
5f65a108a559
hgweb: pull cgitb into CGI script example, where it can easily be disabled
mpm@selenic.com
parents:
202
diff
changeset
|
7 |
| 159 | 8 # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install |
| 9 from mercurial import hgweb | |
| 10 | |
| 11 h = hgweb.hgweb("/path/to/repo", "repository name") | |
| 12 h.run() |