diff mercurial/wireprotov1server.py @ 44270:f546d2170b0f

merge: introduce a clean_update() for that use-case I find it hard to understand what value to pass for all the arguments to `merge.update()`. I would like to introduce functions that are more specific to each use-case. We already have `graft()`. This patch introduces a `clean_update()` and uses it in some places to show that it works. Differential Revision: https://phab.mercurial-scm.org/D7902
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 15 Jan 2020 15:30:25 -0800
parents 1d1232c0726f
children 3d5fb6cab832
line wrap: on
line diff