Mercurial > hg
view tests/test-debugbackupbundle.t @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -0700 |
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)