D6735: update: added support for --abort flag(issue4404)

mharbison72 added a comment. In D6735#123875 , @khanchi97 wrote: > In D6735#100642 , @mharbison72 wrote: > >> Here's a case I stumbled upon that is a problem. It looks like it thinks it isn't

D6735: update: added support for --abort flag(issue4404)

khanchi97 added a comment. In D6735#100642 , @mharbison72 wrote: > Here's a case I stumbled upon that is a problem. It looks like it thinks it isn't in the middle of an update, but .hgsubstate isn't put back to the pre-update state. > >

D6735: update: added support for --abort flag(issue4404)

mharbison72 added a comment. Here's a case I stumbled upon that is a problem. It looks like it thinks it isn't in the middle of an update, but .hgsubstate isn't put back to the pre-update state. diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t

D6735: update: added support for --abort flag(issue4404)

This revision now requires changes to proceed. mharbison72 added a comment. mharbison72 requested changes to this revision. Oops, meant to flag changes needed too. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL

D6735: update: added support for --abort flag(issue4404)

mharbison72 added a comment. In D6735#100392 , @durin42 wrote: > This looks good to me. Does anyone else have comments? @mharbison72 are you happy with the subrepo test coverage? I forgot about this, thanks for the reminder. @taapas1128

D6735: update: added support for --abort flag(issue4404)

taapas1128 added a comment. taapas1128 marked an inline comment as done. @durin42 I don't think the subrepos are properly initialized in the tests. I would be updating them soon. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION

D6735: update: added support for --abort flag(issue4404)

durin42 added a comment. durin42 accepted this revision as: durin42. This looks good to me. Does anyone else have comments? @mharbison72 are you happy with the subrepo test coverage? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION

D6735: update: added support for --abort flag(issue4404)

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

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16294. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16262=16294 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

mharbison72 added inline comments. 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

D6735: update: added support for --abort flag(issue4404)

pulkit added a comment. Nice start! If I remember correctly, the mergestate stores the local version of the file. We can use that directly instead. INLINE COMMENTS > hg.py:992 > +for f in ms: > +ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) > +ms.mark(f,

D6735: update: added support for --abort flag(issue4404)

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16262. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16261=16262 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL

D6735: update: added support for --abort flag(issue4404)

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > pulkit wrote in test-merge-tools.t:2092 > I suggest taking `update --abort` tests in a new file as we will need to > extensively test that. I have created a separate file will add more tests.

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16261. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16251=16261 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

pulkit added inline comments. INLINE COMMENTS > test-merge-tools.t:2092 > + > +Test for 'hg update --abort' > + I suggest taking `update --abort` tests in a new file as we will need to extensively test that. > test-merge-tools.t:2129 > + merging file > + warning: conflicts while merging

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16251. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16250=16251 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16250. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16249=16250 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds functionality to abort a conflicted update. A new function `hg.abortupdate()` is added for the purpose which has a helper function