Mercurial > hg-stable
changeset 5502:a7248da55467
Merge with -stable.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri, 02 Nov 2007 12:15:39 -0700 |
| parents | 52d6feb62692 (current diff) 07bdb5e5d08c (diff) |
| children | 6f26c7677463 |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Thu Nov 01 15:22:22 2007 -0700 +++ b/hgext/convert/__init__.py Fri Nov 02 12:15:39 2007 -0700 @@ -299,6 +299,7 @@ """Convert a foreign SCM repository to a Mercurial one. Accepted source formats: + - Mercurial - CVS - Darcs - git @@ -315,8 +316,8 @@ basename of the source with '-hg' appended. If the destination repository doesn't exist, it will be created. - If <revmapfile> isn't given, it will be put in a default location - (<dest>/.hg/shamap by default). The <revmapfile> is a simple text + If <MAPFILE> isn't given, it will be put in a default location + (<dest>/.hg/shamap by default). The <MAPFILE> is a simple text file that maps each source commit ID to the destination ID for that revision, like so: <source ID> <destination ID> @@ -342,11 +343,12 @@ rename from/file to/file The 'include' directive causes a file, or all files under a - directory, to be included in the destination repository. The - 'exclude' directive causes files or directories to be omitted. - The 'rename' directive renames a file or directory. To rename - from a subdirectory into the root of the repository, use '.' as - the path to rename to. + directory, to be included in the destination repository, and the + exclussion of all other files and dirs not explicitely included. + The 'exclude' directive causes files or directories to be omitted. + The 'rename' directive renames a file or directory. To rename from a + subdirectory into the root of the repository, use '.' as the path to + rename to. """ util._encoding = 'UTF-8'
--- a/mercurial/diffhelpers.c Thu Nov 01 15:22:22 2007 -0700 +++ b/mercurial/diffhelpers.c Fri Nov 02 12:15:39 2007 -0700 @@ -83,6 +83,12 @@ _fix_newline(hunk, a, b); continue; } + if (c == '\n') { + /* Some patches may be missing the control char + * on empty lines. Supply a leading space. */ + Py_DECREF(x); + x = PyString_FromString(" \n"); + } PyList_Append(hunk, x); if (c == '+') { l = PyString_FromString(s + 1);