comparison hgext/rebase.py @ 45576:c1b603cdc95a

merge: add a higher-level update() for the common `hg update` use case

This is different from the `update()` function that I just made
private. The new function is specifically for the normal `hg update`
use case. It doesn't do a merge and it doesn't do a clean (forced)
update.

Differential Revision: https://phab.mercurial-scm.org/D9066

45575:147fb889278b

                            )
                        )
                        cmdutil.bailifchanged(repo)
                        self.inmemory = False
                        self._assignworkingcopy()
                        mergemod._update(
                            repo,
                            p1,
                            branchmerge=False,
                            force=False,
                            wc=self.wctx,
                        )
                        rebasenode(
                            repo,
                            rev,
                            p1,
                            p2,

45576:c1b603cdc95a

                            )
                        )
                        cmdutil.bailifchanged(repo)
                        self.inmemory = False
                        self._assignworkingcopy()
                        mergemod.update(repo[p1], wc=self.wctx)
                        rebasenode(
                            repo,
                            rev,
                            p1,
                            p2,