One-click merge

[Dave Brondsema <da...@brondsema.net>]

I created a merge request on forge-allura.apache.org this morning and realized
that the one-click merge functionality isn't going to work there.  The git repo
at https://forge-allura.apache.org/p/allura/git/ is not the canonical repo, just
a mirror of it.  (We do show the canonical repo in the checkout command, due to
a config override)  So one-click merge is only going to update the local copy
not the real canonical repo.

Perhaps we then need a per-repo or sitewide option to disable one-click merge?
Thoughts?

-- 
Dave Brondsema : dave@brondsema.net
http://www.brondsema.net : personal
http://www.splike.com : programming
              <><

Re: One-click merge

[Igor Bondarenko <je...@gmail.com>]

I think per-repo option would be good.

On Tue, Mar 24, 2015 at 4:18 PM, Dave Brondsema <da...@brondsema.net> wrote:

> I created a merge request on forge-allura.apache.org this morning and
> realized
> that the one-click merge functionality isn't going to work there.  The git
> repo
> at https://forge-allura.apache.org/p/allura/git/ is not the canonical
> repo, just
> a mirror of it.  (We do show the canonical repo in the checkout command,
> due to
> a config override)  So one-click merge is only going to update the local
> copy
> not the real canonical repo.
>
> Perhaps we then need a per-repo or sitewide option to disable one-click
> merge?
> Thoughts?
>
> --
> Dave Brondsema : dave@brondsema.net
> http://www.brondsema.net : personal
> http://www.splike.com : programming
>               <><
>