view tests/test-git-import.out @ 2897:dd032b0f02ac

merge: move forgets to the apply stage
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:30:21 -0500
parents e2b69dbb2daa
children b70740aefa4d
line wrap: on
line source

% 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