Mercurial > hg
comparison tests/test-double-merge.t @ 23071:652ab726ba93 stable
amend: fix amending rename commit with diverged topologies (issue4405)
This addresses the bug described in issue4405: when obsolescence markers are
enabled, amending a commit with a file move can lead to the copy information
being lost.
However, the bug is more general and can be reproduced without obsmarkers as
well, as demonstracted by Pierre-Yves and put into the updated test.
Specifically, graph topology divergences between the filelogs and the changelog
can cause copy information to be lost during amends.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Thu, 16 Oct 2014 06:35:06 -0700 |
parents | cb15835456cb |
children | bd625cd4e5e7 |
comparison
equal
deleted
inserted
replaced
23070:c289fb3624b8 | 23071:652ab726ba93 |
---|