allura-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Igor Bondarenko" <>
Subject [allura:tickets] #7836 Merge request shows 0 commits, if upstream has new commits
Date Fri, 06 Mar 2015 09:56:37 GMT
Do we need to update merge request when there are new commits on downstream (source) branch?

Right now we save HEAD of the source branch as it was at the moment of merge request creation,
and show only those commits, but I think it would be nice to update merge request to the latest
commits in the source branch. And it might make things simpler for hg (don't sure about that
100%, but seems like it).

It also would affect [#7830]. We'll need to merge latest commits, instead of relying on saved
`commit_id`, which can be deleted, if we decide that we want this behavior. And change merge
instructions also.

What do you think?


** [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:49 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 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