D4664: mergecommit: add a new extension to merge in-memory and create a commit
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sun Sep 30 17:14:24 EDT 2018
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 disable the path conflicts auditing
- You can specify a merge destination using --dest flag, which means you don't need to update to merge. You can merge two changesets from anywhere
- You can parallelize multiple merges
- This can be used as --dry-run for hg merge as it can tell whether a merge will result in conflicts or not without applying anything
That said, I am not sure if this looks like a good candidate for in-core extension. However, we want to share the work we have done on speeding up merge internally so that it can help other companies which uses merges. So, feel free to pick this up from here if you need this. :)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4664
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list