Return-Path: X-Original-To: apmail-allura-dev-archive@www.apache.org Delivered-To: apmail-allura-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D435817BA5 for ; Tue, 10 Mar 2015 07:44:18 +0000 (UTC) Received: (qmail 31703 invoked by uid 500); 10 Mar 2015 07:44:18 -0000 Delivered-To: apmail-allura-dev-archive@allura.apache.org Received: (qmail 31676 invoked by uid 500); 10 Mar 2015 07:44:18 -0000 Mailing-List: contact dev-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list dev@allura.apache.org Received: (qmail 31663 invoked by uid 99); 10 Mar 2015 07:44:18 -0000 Received: from allura-vm.apache.org (HELO allura-vm) (140.211.11.147) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Mar 2015 07:44:18 +0000 Received: from allura-vm.apache.org (localhost [127.0.0.1]) by allura-vm (Postfix) with ESMTP id 745E52802E6 for ; Tue, 10 Mar 2015 07:44:17 +0000 (UTC) Content-Type: multipart/related; boundary="===============3099262173883044553==" MIME-Version: 1.0 To: dev@allura.apache.org From: "Igor Bondarenko" Reply-To: "[allura:tickets] " <7836@tickets.allura.p.forge-allura.apache.org> Subject: [allura:tickets] Re: #7836 Merge request shows 0 commits, if upstream has new commits Message-ID:

Sender: tickets@allura.p.forge-allura.apache.org In-Reply-To:

References: <54e523c06d19cd28b3d5a499.tickets@allura.p.forge-allura.apache.org>

Date: Tue, 10 Mar 2015 07:44:17 +0000 (UTC) --===============3099262173883044553== Content-Type: multipart/alternative; boundary="===============9128655115292420778==" MIME-Version: 1.0 --===============9128655115292420778== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Yeah, I think current behavior makes sense if we can update merge request, but we should make it more obvious to the user that such possibility exists --- ** [tickets:#7836] Merge request shows 0 commits, if upstream has new commits** **Status:** in-progress **Milestone:** unreleased **Labels:** sf-4 42cc ux sf-current **Created:** Wed Feb 18, 2015 11:44 PM UTC by Dave Brondsema **Last Updated:** Fri Mar 06, 2015 09:56 AM UTC **Owner:** Igor Bondarenko A merge request works ok if the downstream (forked) repo has all of the upstream (parent) repo's commits. But if the upstream repo has new commits on it, then the merge request shows 0 commits. This is because `MergeRequest._commits` can't find the upstream HEAD in the forked repo, so the `log()` doesn't work. We should have a smarter technique for finding the list of added commits. We should also have better error handling and message to the user when it can't be found since that'll probably still happen sometimes. --- Sent from forge-allura.apache.org because dev@allura.apache.org 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. --===============9128655115292420778== MIME-Version: 1.0 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: 7bit

Yeah, I think current behavior makes sense if we can update merge request, but we should make it more obvious to the user that such possibility exists

[tickets:#7836] Merge request shows 0 commits, if upstream has new commits

Status: in-progress
Milestone: unreleased
Labels: sf-4 42cc ux sf-current
Created: Wed Feb 18, 2015 11:44 PM UTC by Dave Brondsema
Last Updated: Fri Mar 06, 2015 09:56 AM UTC
Owner: Igor Bondarenko

A merge request works ok if the downstream (forked) repo has all of the upstream (parent) repo's commits. But if the upstream repo has new commits on it, then the merge request shows 0 commits. This is because MergeRequest._commits can't find the upstream HEAD in the forked repo, so the log() doesn't work. We should have a smarter technique for finding the list of added commits. We should also have better error handling and message to the user when it can't be found since that'll probably still happen sometimes.

Sent from forge-allura.apache.org because dev@allura.apache.org 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.

--===============9128655115292420778==-- --===============3099262173883044553==--