Mercurial > hg
view tests/test-debugbackupbundle.t @ 46157:021925827c60
copies-rust: record overwrite when merging
When detecting fresh value (from current rev) overwriting older ones during
merges, we also record this overwrite for to help potential future comparison.
This does really have any performance effect right now, but it get use closer to
be able to drop all `is_ancestors` when merging.
Differential Revision: https://phab.mercurial-scm.org/D9499
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 02 Dec 2020 15:37:54 +0100 |
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)