Mercurial > hg
view tests/test-pull-permission.t @ 46100:a771ffc378a8
simplemerge: write output only once it's complete
`simplemerge()` can write either to `ui.fout` or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.
Differential Revision: https://phab.mercurial-scm.org/D9550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Dec 2020 00:00:19 -0800 |
parents | f1186c292d03 |
children | 2f2682f40ea0 |
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 new changesets 97310831fa1a 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 checked 1 changesets with 1 changes to 1 files $ cd ..