equal
deleted
inserted
replaced
1555 # symlink |
1555 # symlink |
1556 sane = [] |
1556 sane = [] |
1557 for f in modified: |
1557 for f in modified: |
1558 if ctx2.flags(f) == 'l': |
1558 if ctx2.flags(f) == 'l': |
1559 d = ctx2[f].data() |
1559 d = ctx2[f].data() |
1560 if len(d) >= 1024 or '\n' in d or util.binary(d): |
1560 if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d): |
1561 self.ui.debug('ignoring suspect symlink placeholder' |
1561 self.ui.debug('ignoring suspect symlink placeholder' |
1562 ' "%s"\n' % f) |
1562 ' "%s"\n' % f) |
1563 continue |
1563 continue |
1564 sane.append(f) |
1564 sane.append(f) |
1565 modified = sane |
1565 modified = sane |