- **status**: in-progress --> review - **Comment**: Closed #733. Force-pushed `ib/7830`
Merge request for ForgeHg is [here](https://sourceforge.net/p/forgehg/code/merge-requests/1/). To detect merge conflicts for mercurial, I'm cloning repo and trying to actually merge. Seems like there is no other way to do it without messing up the repo. It must be fast in most of the cases, since mercurial uses FS hard links when cloning from the same file system. However it can take a long time if repo has subrepos, which all will be fetched when we're trying to merge (e.g. https://bitbucket.org/sjl/dotfiles/src) We may want to move `can_merge` to a background task and make an AJAX call from merge request page to determine if request can be merged, but I think we can create another ticket for that. --- ** [tickets:#7830] One-click merge** **Status:** review **Milestone:** unreleased **Labels:** sf-current sf-4 42cc **Created:** Mon Feb 09, 2015 04:17 PM UTC by Dave Brondsema **Last Updated:** Wed Feb 25, 2015 01:04 PM UTC **Owner:** Igor Bondarenko Add a button to merge requests to merge the branch on the server-side. Of course, don't do it if there are conflicts. Also need to consider server-side filesystem permissions and make sure install docs are updated if needed, etc. --- Sent from forge-allura.apache.org because [email protected] is subscribed to https://forge-allura.apache.org/p/allura/tickets/ To unsubscribe from further messages, a project admin can change settings at https://forge-allura.apache.org/p/allura/admin/tickets/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.
