D6735: update: added support for --abort flag(issue4404)
taapas1128 (Taapas Agrawal)
phabricator at mercurial-scm.org
Thu Aug 22 14:21:38 UTC 2019
taapas1128 added inline comments.
taapas1128 marked an inline comment as done.
INLINE COMMENTS
> mharbison72 wrote in test-merge-tools.t:2092
> 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.
@mharbison72 Have a look. I have updated the diff.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6735/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6735
To: taapas1128, #hg-reviewers
Cc: mharbison72, pulkit, mjpieters, mercurial-devel
More information about the Mercurial-devel
mailing list