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

khanchi97 (Sushil khanchi) phabricator at mercurial-scm.org
Mon Feb 26 12:47:30 EST 2018


khanchi97 added a comment.


  Hello Pulkit,
  After spending some time with graft implementation, I hope now I have a good understanding of how graft is working.
  Let me tell you what I have understood and how I want to implement `--no-commit` mode. So when we hit a merge conflict what we do is save the current state in `graftstate` by storing
   `rev for rev in  revs[current_pos: ]`  And after marking resolved, IIUC when we run `$ hg graft --continue` we only left with `graftstate` and we have no idea what are the previous flags passed to graft.
  My solution for `--no-commit` mode:
  As in case of continue, we are only left with graftstate, So I am thinking to make a `no_commit_flag` file similarly as we create `graftstate` file and when we get `--no-commit` flag we can create this file and after completion of the command we can unlink this `no_commit_flag` file. 
  Please let me know if I am on the right path or not?
  Thanks!

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