equal
deleted
inserted
replaced
597 This is to be called when the direstates parent changes to keep track |
597 This is to be called when the direstates parent changes to keep track |
598 of what is the file situation in regards to the working copy and its parent. |
598 of what is the file situation in regards to the working copy and its parent. |
599 |
599 |
600 This function must be called within a `dirstate.parentchange` context. |
600 This function must be called within a `dirstate.parentchange` context. |
601 |
601 |
602 note: the API is at an early stage and we might need to ajust it |
602 note: the API is at an early stage and we might need to adjust it |
603 depending of what information ends up being relevant and useful to |
603 depending of what information ends up being relevant and useful to |
604 other processing. |
604 other processing. |
605 """ |
605 """ |
606 if merged and (clean_p1 or clean_p2): |
606 if merged and (clean_p1 or clean_p2): |
607 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
607 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |