Show More
@@ -1372,7 +1372,7 b' class dirstate(object):' | |||
|
1372 | 1372 | |
|
1373 | 1373 | if not st and t.tracked: |
|
1374 | 1374 | dadd(fn) |
|
1375 | elif t.merged: | |
|
1375 | elif t.merged or t.from_p2: | |
|
1376 | 1376 | madd(fn) |
|
1377 | 1377 | elif t.added: |
|
1378 | 1378 | aadd(fn) |
@@ -1385,7 +1385,6 b' class dirstate(object):' | |||
|
1385 | 1385 | (size != st.st_size and size != st.st_size & _rangemask) |
|
1386 | 1386 | or ((mode ^ st.st_mode) & 0o100 and checkexec) |
|
1387 | 1387 | ) |
|
1388 | or t.from_p2 | |
|
1389 | 1388 | or fn in copymap |
|
1390 | 1389 | ): |
|
1391 | 1390 | if stat.S_ISLNK(st.st_mode) and size != st.st_size: |
General Comments 0
You need to be logged in to leave comments.
Login now