view tests/test-manifest-merging.out @ 4677:de8ec7e1753a

dirstate.status: if a file is marked as copied, consider it modified

After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved