diff tests/test-ancestor.py @ 42213:618b9ffefa87

tests: demonstrate that rename is followed to wrong parent from merge This test case shows another way that copies are handled differently between `hg st` (pathcopies()) and `hg co -m` (mergecopies). The reason is that pathcopies() calls _tracefiles(), which checks that the file nodeid of an ancestor matches the file nodeid in the base commit. mergecopies() should probably be doing the same. Differential Revision: https://phab.mercurial-scm.org/D6323
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 27 Apr 2019 23:30:19 -0700
parents 876494fd967d
children 2372284d9457
line wrap: on
line diff