view tests/test-dumprevlog.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

% prepare repo-a
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions

% dumping revlog of file a to stdout
file: .hg/store/data/a.i
node: 183d2312b35066fb6b3b449b84efc370d50993d0
linkrev: 0
parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
length: 15
-start-
this is file a

-end-
node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
linkrev: 1
parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
length: 32
-start-
this is file a
adding to file a

-end-
node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
linkrev: 2
parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
length: 54
-start-
this is file a
adding to file a
adding more to file a

-end-
% dumprevlog done

% dump all revlogs to file repo.dump

% undumping into repo-b
.hg/store/00changelog.i
.hg/store/00manifest.i
.hg/store/data/a.i
% undumping done

% clone --pull repo-b repo-c to rebuild fncache
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files

% verify repo-c
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions

% comparing repos
comparing with repo-a
searching for changes
no changes found
comparing with repo-c
searching for changes
no changes found