Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-git-import.out @ 3257:c93ce7f10f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents b70740aefa4d
children 1c9b6f1237e0
line wrap: on
line source

% new file
applying patch from stdin
% 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
new
rename
% regular diff
applying patch from stdin
% copy and modify
applying patch from stdin
a
a
b
a
a
% rename and modify
applying patch from stdin
copy2: No such file or directory
a
a
b
c
a