Mercurial > hg > mercurial-crew-with-dirclash
view TODO @ 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 | ef8ff43f9c11 |
children | 25afb21d97ba 688d03d6997a |
line wrap: on
line source
General: - Better documentation - More regression tests - More specific try/except. - less code duplication, more code in the right places - python 2.2 support - better import support - export to git - Add standard files: AUTHORS, CREDITS, COPYING. ChangeLog? What else? - Code cleanup: apply http://python.org/peps/pep-0008.html Core: - 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 - push support (hack exists) - hg over ssh:// - commit mailinglist/trigger/hooks - fast diff extension Commands: - hg status <filename>: file rev, changeset rev, changed, added, deleted, sha-1 - select to pull a subset of the heads - commands.py: number of args too much magic (e.g. in patch()) - 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 - hg annotate -u and hgweb annotate with long $EMAIL - hg -v history doesn't show tkmerge as modified (removed). - hg import vs. hg patch in help etc., import is a reserved python word, PEP8 mentions trailing underscore as a convention for this. - version reporting (hg --version / version.py / setup.py etc.) - hg pull default in a subdir doesn't work, if it is a relative path - optionally only show merges (two parents or parent != changeset-1, etc.) Web: - show tags in hgweb - show parent changeset number in hgweb - 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 (e.g. favicon, stylesheets) - hgweb personalization: timezone (display/change), display of features - hg export 240 shows -tkmerge (good), hgweb does not (bad). - 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