D2409: graft: add no-commit mode (issue5631)

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Sat Feb 24 04:13:18 EST 2018


pulkit added a comment.


  Can you test about the `--no-commit` flag being respected when we do `--continue` in case of conflicts? That part is not handled by this patch yet.
  
  To elaborate:
  
    $ hg graft --no-commit
      warning: conflicts while merging ...
    $ resolve the conflicts
    $ hg graft --continue
      ^^ this should respect --no-commit by not creating a commit

INLINE COMMENTS

> test-graft.t:1390
> +  grafting 1:925d80f479bb "1"
> +  note: graft of 1:925d80f479bb created no changes to commit
> +

We don't want this message while using `hg graft --no-commit`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2409

To: khanchi97, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list