tests/test-git-import.out
author Matt Mackall <mpm@selenic.com>
Tue, 15 Aug 2006 15:45:45 -0500
changeset 2911 95cc73523983
parent 2863 e2b69dbb2daa
child 2907 b70740aefa4d
permissions -rw-r--r--
Use revlog hash comparison technique in merge

% new file
applying patch from stdin
patching file new
% chmod +x
applying patch from stdin
% copy
applying patch from stdin
a
a
% rename
applying patch from stdin
copyx
new
rename
% delete
applying patch from stdin
patching file copyx
new
rename
% regular diff
applying patch from stdin
patching file rename
% copy and modify
applying patch from stdin
patching file copy2
a
a
b
a
a
% rename and modify
applying patch from stdin
patching file rename2
copy2: No such file or directory
a
a
b
c
a