Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging.out @ 5084:edfe69548e2a
posixfile_nt: '+' should allow read access.
This fixes unexpected I/O error on committing many files
due to cset:8a53b39cd402 (r4902 in crew).
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Wed, 25 Jul 2007 15:58:10 +0900 |
parents | be8efb6e1cc6 |
children |
line wrap: on
line source
% 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