equal
deleted
inserted
replaced
2493 else: |
2493 else: |
2494 # Not touched in current dirstate. |
2494 # Not touched in current dirstate. |
2495 |
2495 |
2496 # file is unknown in parent, restore older version or ignore. |
2496 # file is unknown in parent, restore older version or ignore. |
2497 if abs not in repo.dirstate: |
2497 if abs not in repo.dirstate: |
2498 if mfentry: |
2498 if exact: |
2499 handle(actions['add'], True) |
|
2500 elif exact: |
|
2501 ui.warn(_('file not managed: %s\n') % rel) |
2499 ui.warn(_('file not managed: %s\n') % rel) |
2502 continue |
2500 continue |
2503 |
2501 |
2504 # parent is target, no changes mean no changes |
2502 # parent is target, no changes mean no changes |
2505 if node == parent: |
2503 if node == parent: |