Mercurial > hg
view tests/test-pull-permission.t @ 27027:a01ecbcfaf84
mergestate: handle additional record types specially
This works around a bug in older Mercurial versions' handling of the v2 merge
state.
We also add a bunch of tests that make sure that
(1) we correctly abort when the merge state has an unsupported record type
(2) aborting the merge, rebase or histedit continues to work and clears out the
merge state.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 15:46:45 -0800 |
parents | 8fb6844a4ff1 |
children | eb586ed5d8ce |
line wrap: on
line source
#require unix-permissions no-root $ hg init a $ cd a $ echo foo > b $ hg add b $ hg ci -m "b" $ chmod -w .hg/store $ cd .. $ hg clone a b requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ chmod +w a/.hg/store # let test clean up $ cd b $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions $ cd ..