Mercurial > hg
comparison hgext/rebase.py @ 45556:03726f5b6092
merge: use merge.clean_update() when applicable
We have had this higher-level function (higher than `merge.update()`,
that is) for a while. Let's simply some callers by using it. I don't
know why I didn't do this when I introduced the function.
After this patch, there are no remaining callers that call
`hg.updaterepo()` with `overwrite=True`. We'll clean that up soon.
Differential Revision: https://phab.mercurial-scm.org/D9063
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 21 Sep 2020 10:09:39 -0700 |
parents | feffeb18d412 |
children | 2c86b9587740 |
comparison
equal
deleted
inserted
replaced
45555:feffeb18d412 | 45556:03726f5b6092 |
---|---|
1097 b'changesets' | 1097 b'changesets' |
1098 ), | 1098 ), |
1099 ) | 1099 ) |
1100 # update to the current working revision | 1100 # update to the current working revision |
1101 # to clear interrupted merge | 1101 # to clear interrupted merge |
1102 hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) | 1102 mergemod.clean_update(repo[rbsrt.originalwd]) |
1103 rbsrt._finishrebase() | 1103 rbsrt._finishrebase() |
1104 return 0 | 1104 return 0 |
1105 elif inmemory: | 1105 elif inmemory: |
1106 try: | 1106 try: |
1107 # in-memory merge doesn't support conflicts, so if we hit any, abort | 1107 # in-memory merge doesn't support conflicts, so if we hit any, abort |