Skip to content
Snippets Groups Projects
Commit a7248da55467 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Merge with -stable.

No related branches found
No related tags found
No related merge requests found
......@@ -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'
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment