Mercurial > public > mercurial-scm > hg
diff tests/test-import @ 10729:7a5931c5f2dc stable
patch: enhance diff detection regexp, allow '--- ' in patch message
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 18 Mar 2010 18:22:34 +0100 |
| parents | 3212afb33116 |
| children | d94832c4a31d |
line wrap: on
line diff
--- a/tests/test-import Thu Mar 18 16:38:07 2010 +0100 +++ b/tests/test-import Thu Mar 18 18:22:34 2010 +0100 @@ -375,6 +375,25 @@ hg parents -v cd .. +echo % '--- in commit message' +hg init commitconfusion +cd commitconfusion +cat > a.patch <<EOF +module: summary + +--- description + +diff --git a/a b/a +new file mode 100644 +--- /dev/null ++++ b/a +@@ -0,0 +1,1 @@ ++a +EOF +hg import -d '0 0' a.patch +hg parents -v +cd .. + echo '% tricky header splitting' cat > trickyheaders.patch <<EOF From: User A <user@a>