Mercurial > hg
comparison mercurial/merge.py @ 7569:89207edf3973
correctly update dirstate after update+mode change (issue1456)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 07 Jan 2009 02:11:17 +0100 |
| parents | 865c5be0f8df |
| children | 4dd7b28003d2 a679bd371091 |
comparison
equal
deleted
inserted
replaced
| 7568:12df451ce205 | 7569:89207edf3973 |
|---|---|
| 367 repo.dirstate.remove(f) | 367 repo.dirstate.remove(f) |
| 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 in "ge": # get or exec change | 372 elif m == "e": # exec change |
| 373 repo.dirstate.normaldirty(f) | |
| 374 elif m == "g": # get | |
| 373 if branchmerge: | 375 if branchmerge: |
| 374 repo.dirstate.normaldirty(f) | 376 repo.dirstate.normaldirty(f) |
| 375 else: | 377 else: |
| 376 repo.dirstate.normal(f) | 378 repo.dirstate.normal(f) |
| 377 elif m == "m": # merge | 379 elif m == "m": # merge |