tests/test-manifest-merging.out
author Adrian Buehlmann <adrian@cadifra.com>
Sat, 13 Dec 2008 17:39:56 +0100
changeset 7514 e54cf540c6ca
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
store: don't create dirs ending in period or space for hashed paths (issue1417) Windows won't create directories with names ending in period or space, so we replace the last period/space character in truncated directory names of hashed paths with some other character (underbar).

% 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