diff tests/test-bookmarks-merge.t @ 23616:11a160547d7f

context: return dirstate parents in workingctx.ancestors() workingctx.ancestors() was not returning the dirstate parents as part of the result set. The only place this function is used is for copy detection when committing a file, and that code already checks the parents manually, so this change has no affect at the moment. I found it while playing around with changing how copy detection works.
author Durham Goode <durham@fb.com>
date Thu, 18 Dec 2014 09:37:14 -0800
parents 10f15e34d86c
children 8197b395710e
line wrap: on
line diff