D4664: mergecommit: add a new extension to merge in-memory and create a commit

This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. There seems to have been no activities on this Diff for the past 3 Months. By policy, we are automatically moving it out of the `need-review` state. Please, move it back

D4664: mergecommit: add a new extension to merge in-memory and create a commit

pulkit added a comment. In D4664#100404 , @durin42 wrote: > Neat. I assume you normally check these out later? For now yes. The plan was to make `hg cat` support cat-ing maultiple files preventing to checkout. REPOSITORY rHG Mercurial

D4664: mergecommit: add a new extension to merge in-memory and create a commit

durin42 added a comment. Neat. I assume you normally check these out later? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D4664/new/ REVISION DETAIL https://phab.mercurial-scm.org/D4664 To: pulkit, #hg-reviewers Cc: durin42, marcink,

D4664: mergecommit: add a new extension to merge in-memory and create a commit

pulkit added a comment. I don't aim for this to get reviewed and pushed. This is here right now for sharing. We are using this extension internally for months now and has shown good results. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4664 To: pulkit,

D4664: mergecommit: add a new extension to merge in-memory and create a commit

pulkit updated this revision to Diff 14248. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4664?vs=11198=14248 REVISION DETAIL https://phab.mercurial-scm.org/D4664 AFFECTED FILES hgext/mergecommit.py mercurial/filemerge.py

D4664: mergecommit: add a new extension to merge in-memory and create a commit

pulkit added a comment. Thinking about this more, I think I have not done a good job writing commit message. The extension is very useful when you have automation around merges or you do merges because of the following reasons: - The merge is done in-memory and is very fast if you

D4664: mergecommit: add a new extension to merge in-memory and create a commit

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds a new mergecommit command which is very useful for workflows where there is automated merging involved. This patch uses existing in-memory merge