Mercurial > hg
diff tests/test-git-import @ 3716:ab5600428b08
handle files with both git binary patches and copy/rename ops
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Nov 2006 22:03:31 -0200 |
parents | 05c8704a3743 |
children | 9e248cfd8b94 |
line wrap: on
line diff
--- a/tests/test-git-import Mon Nov 27 15:27:09 2006 -0800 +++ b/tests/test-git-import Mon Nov 27 22:03:31 2006 -0200 @@ -143,3 +143,22 @@ hg cat rename3 echo hg cat rename3-2 + +echo foo > foo +hg add foo +hg ci -m 'add foo' +echo % binary files and regular patch hunks +hg import -m binaryregular - <<EOF +diff --git a/binary b/binary +new file mode 100644 +index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 +GIT binary patch +literal 4 +Lc\${NkU|;|M00aO5 + +diff --git a/foo b/foo2 +rename from foo +rename to foo2 +EOF +cat foo2 +hg manifest | grep binary