tests/test-manifest-merging.out
author Henrik Stuart <henrik.stuart@edlund.dk>
Tue, 12 May 2009 15:50:44 +0200
changeset 8364 fa901423ac23
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
windows: avoid deleting non-empty reparse points If a hg repository including working directory is a reparse point (directory symlinked or a junction point), then using os.removedirs will remove the reparse point erroneously. This is fixed by only removing directories if they are empty.

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating working directory
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