view tests/test-fncache.out @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

% init repo1

% add a; ci
adding a

% cat .hg/store/fncache
data/a.i

% add a.i/b; ci
adding a.i/b

% cat .hg/store/fncache
data/a.i
data/a.i.hg/b.i

% add a.i.hg/c; ci
adding a.i.hg/c

% cat .hg/store/fncache
data/a.i
data/a.i.hg/b.i
data/a.i.hg.hg/c.i

% hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 3 changesets, 3 total revisions

% rm .hg/store/fncache

% hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
 data/a.i@0: missing revlog!
 data/a.i.hg/c.i@2: missing revlog!
 data/a.i/b.i@1: missing revlog!
3 files, 3 changesets, 3 total revisions
3 integrity errors encountered!
(first damaged changeset appears to be 0)
% non store repo
adding tst.d/foo
.hg
.hg/00changelog.i
.hg/00manifest.i
.hg/data
.hg/data/tst.d.hg
.hg/data/tst.d.hg/foo.i
.hg/dirstate
.hg/requires
.hg/undo
.hg/undo.branch
.hg/undo.dirstate
% non fncache repo
adding tst.d/Foo
.hg
.hg/00changelog.i
.hg/dirstate
.hg/requires
.hg/store
.hg/store/00changelog.i
.hg/store/00manifest.i
.hg/store/data
.hg/store/data/tst.d.hg
.hg/store/data/tst.d.hg/_foo.i
.hg/store/undo
.hg/undo.branch
.hg/undo.dirstate