Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-after-merge.out @ 5478:bff41174563f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only set mode of new patch if the target file was removed before. If the file is writable by the user, but owned by a different user, the chmod will otherwise fail with "Operation not permitted". Additionally make very sure that the file is only written if either the number of links is <= 1 or the file was successfully removed. Maybe this minimal COW code should be replaced by something from util.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 25 Oct 2007 19:40:56 +0200
parents c6682cdada2f
children
line wrap: on
line source

% create source repository
adding a
% fork source repository
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% rename b as c
A c
R b
% rename back c as b