Show More
@@ -2899,7 +2899,7 b' class localrepository(object):' | |||
|
2899 | 2899 | |
|
2900 | 2900 | # is the file changed? |
|
2901 | 2901 | text = fctx.data() |
|
2902 |
if fparent2 != nullid or flog.cmp(fparent1, text) |
|
|
2902 | if fparent2 != nullid or meta or flog.cmp(fparent1, text): | |
|
2903 | 2903 | changelist.append(fname) |
|
2904 | 2904 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
2905 | 2905 | # are just the flags changed during merge? |
General Comments 0
You need to be logged in to leave comments.
Login now