Mercurial > public > mercurial-scm > hg-stable

diff tests/test-git-import.t @ 14535:e597ef52a7c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: dot not ignore hunk of files marked as 'deleted' git 'deleted' flag was processed unconditionnally and the file removed even if the related hunk was not matching.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 05 Jun 2011 22:26:01 +0200
parents ee574cfd0c32
children
line wrap: on
line diff
--- a/tests/test-git-import.t	Sun Jun 05 22:24:19 2011 +0200
+++ b/tests/test-git-import.t	Sun Jun 05 22:26:01 2011 +0200
@@ -442,4 +442,27 @@
   [255]
   $ cat b
   b
+
+  $ ln -s b linkb
+  $ hg add linkb
+  $ hg ci -m addlinkb
+  $ hg import --no-commit - <<EOF
+  > diff --git a/linkb b/linkb
+  > deleted file mode 120000
+  > --- a/linkb
+  > +++ /dev/null
+  > @@ -1,1 +0,0 @@
+  > -badhunk
+  > \ No newline at end of file
+  > EOF
+  applying patch from stdin
+  patching file linkb
+  Hunk #1 FAILED at 0
+  1 out of 1 hunks FAILED -- saving rejects to file linkb.rej
+  abort: patch failed to apply
+  [255]
+  $ hg st
+  ? b.rej
+  ? linkb.rej
+
   $ cd ..