comparison tests/test-double-merge.t @ 24817:0bb98eee531d stable

committablefilectx: propagate ancestry info to parent to fix annotation Before this patch, annotating working directory could include wrong revisions that were hidden or belonged to different branches. This fixes wfctx.parents() to set _descendantrev so that all ancestors can take advantage of the linkrev adjustment introduced at c48924787eaa. _adjustlinkrev() can handle 'None' revision thanks to 5a12ef618c03.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 18 Apr 2015 14:10:55 +0900
parents cb15835456cb
children bd625cd4e5e7
comparison
equal deleted inserted replaced
24816:8eec040cb65e 24817:0bb98eee531d