Mercurial > hg > mercurial-crew-with-dirclash
annotate MANIFEST.in @ 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 | 06bc1ef248a6 |
children | 20fc66131bc0 |
rev | line source |
---|---|
7 | 1 include hg |
2 recursive-include mercurial *.py | |
3 include tkmerge | |
188 | 4 include hgweb.cgi |
5 include hgeditor rewrite-log convert-repo | |
6 include tests/* | |
7 | 7 include *.txt |
218
06bc1ef248a6
hgweb: put map-raw in setup.py and MANIFEST.in
mpm@selenic.com
parents:
188
diff
changeset
|
8 include templates/map templates/map-*[a-z] |
188 | 9 include templates/*.tmpl |
10 include doc/* | |
7 | 11 include README |