comparison tests/test-fix.t @ 39111:46da52f4b820

commit: try hard to reuse p1 manifest if nothing changed This is all for commit reproducibility on "hg convert". With this change, p1 manifest is reused if ctx.files() *to be committed* is empty, and if new manifest entry is identical to p1. This is important property for "hg convert" since memctx.files() built from a convert source may be either a) more narrowed thanks to a committed ctx.files() which provides more accurate status, or b) containing redundant files because of sloppy filtering on e.g. octopus merge.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 07 Jul 2018 22:40:39 +0900
parents a009589cd32a
children 5abc47d4ca6b
comparison
equal deleted inserted replaced
39110:f0c2653ca706 39111:46da52f4b820
849 | 849 |
850 o f9ac foo.whole 850 o f9ac foo.whole
851 851
852 $ hg fix -r 0:2 852 $ hg fix -r 0:2
853 $ hg log --graph --template '{node|shortest} {files}' 853 $ hg log --graph --template '{node|shortest} {files}'
854 o 3801 bar.whole 854 o b4e2 bar.whole
855 | 855 |
856 o 38cc 856 o 59f4
857 | 857 |
858 | @ bc05 bar.whole 858 | @ bc05 bar.whole
859 | | 859 | |
860 | x 4fd2 foo.whole 860 | x 4fd2 foo.whole
861 |/ 861 |/