comparison .jshintrc @ 45412:aaeccdb6e654 stable

repoview: pin revisions for `local` and `other` when a merge is active I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes `p1` and updating to the successor results in merge conflicts. The problem was resolving them failed immediately, complaining that the old checkout was filtered. The change in `test-rebase-obsolete.t` is because there's an outstanding merge conflict in a rebase operation. The summary prompt to merge seems incorrect for this scenario, but that's an existing issue. Differential Revision: https://phab.mercurial-scm.org/D8980
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 04 Sep 2020 15:21:02 -0400
parents bdd2e18b54c5
children
comparison
equal deleted inserted replaced
45398:d58a205d0672 45412:aaeccdb6e654