This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12386

tests: demonstrate that copy info in changeset gets lost on amend
ClosedPublic

Authored by martinvonz on Sat, Mar 19, 1:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe3c75d65d589: tests: demonstrate that copy info in changeset gets lost on amend
Summary

When copy information is stored in changesets, it gets lost on
amend. We didn't notice that until now because our users at Google
have the config set to compatibility, which means copy information
is stored in both changeset and filelogs.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-in-changeset.t (9 lines)

Diff 32674

tests/test-copies-in-changeset.t

a -> k a -> k
$ hg showcopies --config experimental.copies.read-from=filelog-only $ hg showcopies --config experimental.copies.read-from=filelog-only
a -> k a -> k
#else #else
$ hg showcopies $ hg showcopies
a -> k a -> k
#endif #endif
Existing copy information is preserved by amend
$ hg cp a l
$ hg ci -m 'copy a to l'
$ hg showcopies
a -> l
$ hg ci --amend -m 'new description'
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
$ hg showcopies
a -> l (no-extra !)
$ cd .. $ cd ..
Test rebasing a commit with copy information Test rebasing a commit with copy information
$ hg init rebase-rename $ hg init rebase-rename
$ cd rebase-rename $ cd rebase-rename
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'