ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Currently, failed file merges will nevertheless force the user to continue
attempting to merge all additional unresolved files. Future patches will allow
the use
krbullock added inline comments.
INLINE COMMENTS
> test-merge-halt.t:24
> + $ echo onfailure=continue >> $HGRCPATH
> + $ hg rebase -s 1 -d 2 --tool false
> + rebasing 1:1f28a51c3c9b "c"
Why test this with rebase instead of merge?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mer
ryanmce added inline comments.
INLINE COMMENTS
> krbullock wrote in test-merge-halt.t:24
> Why test this with rebase instead of merge?
That's how I roll. That being said, I'm happy to change it if people feel
testing merge would provide more value.
REPOSITORY
rHG Mercurial
REVISION DETAIL
quark added inline comments.
INLINE COMMENTS
> test-merge-halt.t:32
> + [1]
> +
> + $ hg rebase --abort
Should we have an `hg resolve -l` here?
> test-merge-halt.t:36
> +
> +Halting works on first failure
> + $ echo onfailure=halt >> $HGRCPATH
It feels a bit strange that the text says "work
ryanmce added inline comments.
INLINE COMMENTS
> quark wrote in test-merge-halt.t:32
> Should we have an `hg resolve -l` here?
sounds good
> quark wrote in test-merge-halt.t:36
> It feels a bit strange that the text says "works". Maybe use some neutral
> words like "Testing onfailure=continue"
ryanmce updated this revision to Diff 2499.
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D930?vs=2411&id=2499
REVISION DETAIL
https://phab.mercurial-scm.org/D930
AFFECTED FILES
tests/test-merge-halt.t
CHANGE DETAILS
diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt
quark accepted this revision.
quark added a comment.
It seems this revision is not associated with `HG` callsign somehow. I've
added it manually.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D930
To: ryanmce, #hg-reviewers, quark
Cc: quark, krbullock, mercuria
ryanmce added a comment.
> I guess you missed phabricator.callsign = HG in .hg/hgrc.
Yes, that's the case. I've fixed that in my repo.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D930
To: ryanmce, #hg-reviewers, quark
Cc: quark, krbullock, mercurial-devel
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG143337bcec9b: merge: add tests to show current behavior on
failed filemerges (authored by ryanmce, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
