incubator-allura-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Dave Brondsema" <brond...@users.sf.net>
Subject [allura:tickets] Re: #4665 Git merge instructions don't take source branch into account
Date Tue, 30 Jul 2013 21:55:27 GMT
Makes sense to me.  Since it's a new field, make sure that when merge requests are displayed,
that old records that don't have that field still work (may not be entirely accurate, but
at least shoudn't error out)


---

** [tickets:#4665] Git merge instructions don't take source branch into account**

**Status:** in-progress
**Labels:** merge-requests 42cc 
**Created:** Tue Aug 07, 2012 03:31 PM UTC by Dave Brondsema
**Last Updated:** Tue Jul 30, 2013 07:23 PM UTC
**Owner:** nobody

If you have a forked repo, and make changes on a non-master branch (e.g. dev), and request
a merge, the git instructions that are shown to the merger don't work.  Specifically, the
"git merge" command fails because it doesn't know about the commit because the "git fetch"
command only fetches master and not the branch (e.g. dev).  "git fetch /repo/url dev" would
work but we don't store the source branch (dev) on the MergeRequest artifact.  Maybe "git
fetch /repo/url commit-hash" would work, but that is somewhat verbose.

This should be tested (using multiple commits on a non-master branch) and then the best set
of commands should be established.


---

Sent from sourceforge.net because allura-dev@incubator.apache.org is subscribed to https://sourceforge.net/p/allura/tickets/

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