Mailing-List: contact allura-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: allura-dev@incubator.apache.org
Received-SPF: pass (nike.apache.org: domain of noreply@sourceforge.net
 designates 216.34.181.60 as permitted sender)
Content-Type: multipart/related;
 boundary="===============4519966112993012759=="
MIME-Version: 1.0
To: "[allura:tickets] " <4665@tickets.allura.p.re.sf.net>
From: "Dave Brondsema" <brondsem@users.sf.net>
Reply-To: "[allura:tickets] " <4665@tickets.allura.p.re.sf.net>
Subject: [allura:tickets] #4665 Git merge instructions don't take source
 branch into
 account
Message-ID: 
 </p/allura/tickets/4665/f7b412d7e411a2f308839e70025b194c65013305.tickets@allura.p.sourceforge.net>
Date: Mon, 22 Jul 2013 14:49:23 +0000

--===============4519966112993012759==
Content-Type: multipart/alternative;
 boundary="===============7209568878526669552=="
MIME-Version: 1.0

--===============7209568878526669552==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

- **labels**: merge-requests --> merge-requests, 42cc


---

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

**Status:** open
**Labels:** merge-requests 42cc 
**Created:** Tue Aug 07, 2012 03:31 PM UTC by Dave Brondsema
**Last Updated:** Fri Jun 28, 2013 04:48 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.
--===============7209568878526669552==
MIME-Version: 1.0
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: 7bit

<div class="markdown_content"><ul>
<li><strong>labels</strong>: merge-requests --&gt; merge-requests, 42cc</li>
</ul>
<hr />
<p><strong> <a class="alink" href="http://sourceforge.net/p/allura/tickets/4665/">[tickets:#4665]</a> Git merge instructions don't take source branch into account</strong></p>
<p><strong>Status:</strong> open<br />
<strong>Labels:</strong> merge-requests 42cc <br />
<strong>Created:</strong> Tue Aug 07, 2012 03:31 PM UTC by Dave Brondsema<br />
<strong>Last Updated:</strong> Fri Jun 28, 2013 04:48 PM UTC<br />
<strong>Owner:</strong> nobody</p>
<p>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.</p>
<p>This should be tested (using multiple commits on a non-master branch) and then the best set of commands should be established.</p>
<hr />
<p>Sent from sourceforge.net because allura-dev@incubator.apache.org is subscribed to <a href="https://sourceforge.net/p/allura/tickets/">https://sourceforge.net/p/allura/tickets/</a></p>
<p>To unsubscribe from further messages, a project admin can change settings at <a href="https://sourceforge.net/p/allura/admin/tickets/options.">https://sourceforge.net/p/allura/admin/tickets/options.</a>  Or, if this is a mailing list, you can unsubscribe from the mailing list.</p></div>
--===============7209568878526669552==--

--===============4519966112993012759==--