# HG changeset patch
# User mpm@selenic.com
# Date 2005-06-16 05:23:07
# Node ID c72ccad3e3b87ad8853b99f2af2eefab14acb9f3
# Parent  4e23eaffd4ae3e07b03c987bf9903173a0033790
# Parent  c8bd9793446de2ce21b642433ae1db0d03e8b028

Merge with TAH

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Merge with TAH

manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8
C/m6MZJqlOKhIT4jazPwngU=
=ECGy
-----END PGP SIGNATURE-----


diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -6,12 +6,12 @@ General:
 - python 2.2 support
 - better import support
 - export to git
+- Add standard files: AUTHORS, CREDITS, COPYING. ChangeLog? What else?
 
 Core:
-- difflib creating/removing files (fixed except dates?)
-- directory foo.d or foo.i with existing file foo; hgweb.cgi.[di] and
-  apache
-- get various options from hgrc
+- difflib creating/removing files (fixed except dates: should be epoch)
+- directory foo.d or foo.i with existing file foo (use some quoting?)
+- get various options from hgrc (e.g. history always -v, tip always -q)
 - allow full decimal (part of) hash
   hg export 5005048662 -> OverflowError: long int too large to convert
   to int
@@ -25,7 +25,6 @@ Commands:
   deleted, sha-1
 - select to pull a subset of the heads
 - commands.py: number of args too much magic (e.g. in patch())
-- link children in hgweb
 - adding a tag with "hg tag foobar"
 - automatic pull fallback to old-http://
 - hg init|pull http://example.com doesn't say that no repo was found
@@ -33,17 +32,21 @@ Commands:
 - hg -v history doesn't show tkmerge as modified (removed).
 - hg import vs. hg patch in help etc. (import is a reserved python
   word)
-- version reporting
+- version reporting (hg --version / version.py / setup.py etc.)
+- hg pull default in a subdir doesn't work, if it is a relative path
+- show tags in hg history
+- optionally only show merges (two parents or parent != changeset-1, etc.)
 
 Web:
-- show tags in hgweb + hg history
+- show tags in hgweb
 - show parent changeset number in hgweb
-- optionally only show merges (parent != changeset-1, etc.)
+- optionally only show merges (two parents or parent != changeset-1, etc.)
 - one hgweb with many repos (another script)
 - hgweb tip link too verbose
-- hgweb: deliver static files from .hg (e.g. favicon?)
+- hgweb: deliver static files (e.g. favicon, stylesheets)
 - hgweb personalization: timezone (display/change), display of
   features
 - hg export 240 shows -tkmerge (good), hgweb does not (bad).
-
-(originally from a posting by Thomas Arendsen Hein)
+- some web servers think hgweb.cgi.[di] is a CGI script with old-http://
+  (use quoting (see foo.d in Core) or document server configurations?)
+- link children in hgweb