Mercurial > hg
comparison mercurial/merge.py @ 7630:a679bd371091
merge: fix execute bit update issue introduced by 89207edf3973
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 13 Jan 2009 22:41:06 +0100 |
| parents | 89207edf3973 |
| children | 0b2ee57dfdb1 |
comparison
equal
deleted
inserted
replaced
| 7614:f9fcb189c8e2 | 7630:a679bd371091 |
|---|---|
| 368 else: | 368 else: |
| 369 repo.dirstate.forget(f) | 369 repo.dirstate.forget(f) |
| 370 elif m == "f": # forget | 370 elif m == "f": # forget |
| 371 repo.dirstate.forget(f) | 371 repo.dirstate.forget(f) |
| 372 elif m == "e": # exec change | 372 elif m == "e": # exec change |
| 373 repo.dirstate.normaldirty(f) | 373 repo.dirstate.normallookup(f) |
| 374 elif m == "g": # get | 374 elif m == "g": # get |
| 375 if branchmerge: | 375 if branchmerge: |
| 376 repo.dirstate.normaldirty(f) | 376 repo.dirstate.normaldirty(f) |
| 377 else: | 377 else: |
| 378 repo.dirstate.normal(f) | 378 repo.dirstate.normal(f) |