Mercurial > hg
comparison contrib/hgclient.py @ 44348:8082a77cc3a2
rebase: remove some redundant setting of dirstate parents
Since we're now setting the dirstate parents to its correct values
from the beginning (right after `merge.update()`), we usually don't
need to set them again before committing. The only case we need to
care about is when committing collapsed commits. So we can remove the
`setparents()` calls just before committing and add one only for the
collapse case.
Differential Revision: https://phab.mercurial-scm.org/D7828
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 10 Jan 2020 21:40:01 -0800 |
parents | 9f70512ae2cf |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
44347:9c9cfecd4600 | 44348:8082a77cc3a2 |
---|