Mercurial > hg
view tests/test-debugbackupbundle.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 | 20d74eebe56c |
children |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > strip= > EOF Setup repo $ hg init repo $ cd repo Test backups list and recover $ hg debugbackupbundle no backup changesets found $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -l $1 > } $ mkcommit a $ mkcommit b $ hg strip . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d2ae7f538514-2953539b-backup.hg $ hg debugbackupbundle Recover changesets using: hg debugbackupbundle --recover <changeset hash> Available backup changesets: * (glob) d2ae7f538514 b $ hg debugbackupbundle --recover d2ae7f538514 Unbundling d2ae7f538514 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets d2ae7f538514 (1 drafts)