equal
deleted
inserted
replaced
2327 |
2327 |
2328 for f in add[0]: |
2328 for f in add[0]: |
2329 checkout(f) |
2329 checkout(f) |
2330 repo.dirstate.add(f) |
2330 repo.dirstate.add(f) |
2331 |
2331 |
|
2332 normal = repo.dirstate.normallookup |
|
2333 if node == parent and p2 == nullid: |
|
2334 normal = repo.dirstate.normal |
2332 for f in undelete[0]: |
2335 for f in undelete[0]: |
2333 checkout(f) |
2336 checkout(f) |
2334 repo.dirstate.normal(f) |
2337 normal(f) |
2335 |
2338 |
2336 audit_path = util.path_auditor(repo.root) |
2339 audit_path = util.path_auditor(repo.root) |
2337 for f in remove[0]: |
2340 for f in remove[0]: |
2338 audit_path(f) |
2341 audit_path(f) |
2339 try: |
2342 try: |