tests/test-repair-strip.out

tests: fix 05210e955bef merge error in test-git-import.t

% before update 0, strip 2
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

saved backup bundle
transaction abort!
failed to truncate data/b.i
rollback failed - please run hg recover
strip failed, full bundle
abort: Permission denied .hg/store/data/b.i
% after update 0, strip 2
abandoned transaction found - run hg recover
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
 b@?: rev 1 points to nonexistent changeset 2
 (expected 1)
 b@?: 736c29771fba not in manifests
warning: orphan revlog 'data/c.i'
2 files, 2 changesets, 3 total revisions
2 warnings encountered!
2 integrity errors encountered!
% journal contents
00changelog.i
00manifest.i
data/b.i
data/c.i
rolling back interrupted transaction
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions
% before update 0, strip 2
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

abort: Permission denied .hg/store/data/b.i
% after update 0, strip 2
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 4 changesets, 4 total revisions
% journal contents
(no journal)
% before update 0, strip 2
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

saved backup bundle
transaction abort!
failed to truncate 00manifest.i
rollback failed - please run hg recover
strip failed, full bundle
abort: Permission denied .hg/store/00manifest.i
% after update 0, strip 2
abandoned transaction found - run hg recover
checking changesets
checking manifests
 manifest@?: rev 2 points to nonexistent changeset 2
 manifest@?: 3362547cdf64 not in changesets
 manifest@?: rev 3 points to nonexistent changeset 3
 manifest@?: 265a85892ecb not in changesets
crosschecking files in changesets and manifests
 c@3: in manifest but not in changeset
checking files
 b@?: rev 1 points to nonexistent changeset 2
 (expected 1)
 c@?: rev 0 points to nonexistent changeset 3
3 files, 2 changesets, 4 total revisions
1 warnings encountered!
7 integrity errors encountered!
(first damaged changeset appears to be 3)
% journal contents
00changelog.i
00manifest.i
data/b.i
data/c.i
rolling back interrupted transaction
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions