equal
deleted
inserted
replaced
450 repo.dirstate.update([f], 'r') |
450 repo.dirstate.update([f], 'r') |
451 else: |
451 else: |
452 repo.dirstate.forget([f]) |
452 repo.dirstate.forget([f]) |
453 elif m == "f": # forget |
453 elif m == "f": # forget |
454 repo.dirstate.forget([f]) |
454 repo.dirstate.forget([f]) |
455 elif m == "g": # get |
455 elif m in "ge": # get or exec change |
456 if branchmerge: |
456 if branchmerge: |
457 repo.dirstate.update([f], 'n', st_mtime=-1) |
457 repo.dirstate.update([f], 'n', st_mtime=-1) |
458 else: |
458 else: |
459 repo.dirstate.update([f], 'n') |
459 repo.dirstate.update([f], 'n') |
460 elif m == "m": # merge |
460 elif m == "m": # merge |