D6735: update: added support for --abort flag(issue4404)
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Mon Aug 19 12:32:06 EDT 2019
mharbison72 added inline comments.
> taapas1128 wrote in test-merge-tools.t:2092
> I have created a separate file will add more tests.
When you add more tests, please include some with 1 dirty subrepo, and then another where the first subrepo is already merged/resolved, and the second subrepo is dirty and pending a merge/resolve. If it simplifies the initial implementation to detect a dirty subrepo and then abort the `--abort` before it starts, that seems fine.
CHANGES SINCE LAST ACTION
To: taapas1128, #hg-reviewers
Cc: mharbison72, pulkit, mjpieters, mercurial-devel
More information about the Mercurial-devel