allura-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Igor Bondarenko" <>
Subject [allura:tickets] #7830 One-click merge
Date Fri, 06 Mar 2015 12:42:01 GMT
With current approach we can't detect those git conflicts you mentioned above. Maybe we can
do smarter parsing of output of `merge-tree`, but it seems pretty complicated and error-prone.

We can't use 'removed in' as indicator of conflict, since different files can be removed in
upstream and downstream and in this case there's no conflict. See output examples [here](

I think most reliable approach is to try run merge in temporary repository clone and see if
it fails (as hg does). As I mentioned earlier it would require background task + ajax monitoring
on user page. What do you think?

I've fixed other issues you mentioned.

Also take a look at my comment on [#7836]. It can affect this ticket too.

Updated `allura:ib/7830` (force-push).

No new merge request for ForgeHg yet. I found some issues with it, so work in progress.


** [tickets:#7830] One-click merge**

**Status:** in-progress
**Milestone:** unreleased
**Labels:** sf-current sf-4 42cc 
**Created:** Mon Feb 09, 2015 04:17 PM UTC by Dave Brondsema
**Last Updated:** Thu Mar 05, 2015 11:03 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 because is subscribed to

To unsubscribe from further messages, a project admin can change settings at
 Or, if this is a mailing list, you can unsubscribe from the mailing list.
  • Unnamed multipart/related (inline, None, 0 bytes)
View raw message