<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 11/08/2012 02:56 AM, Martin Malina
wrote:<br>
</div>
<blockquote
cite="mid:427450F5-023A-4AED-BC7B-9C1B5D772614@redhat.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<br>
<div>
<div>On 8. 11. 2012, at 11:52, Denis Golovin <<a
moz-do-not-send="true" href="mailto:dgolovin@exadel.com">dgolovin@exadel.com</a>>
wrote:</div>
<br class="Apple-interchange-newline">
<blockquote type="cite">On 11/08/2012 01:19 AM, Max Rydahl
Andersen wrote:<br>
<blockquote type="cite">
<blockquote type="cite">Yesterday we discussed on IRC that
this can be tricky - if you have one topic branch that was
originally based on master for instance and want to apply
the changes to both master and Beta2x then you need to be
careful because if you rebase the Beta2x-based topic
branch to master, it will contain many more new commits
and you only want to cherry pick the ones you really need.
That is clear to me (I hope).<br>
</blockquote>
yes, as with any other PR that is "outofsync" cherrypicking
is the way to go.<br>
<br>
<blockquote type="cite">But I'd like to ask another related
question: What is the recommended approach wrt pull
requests here? The above assumes you have one topic branch
and hence one pull request. So are users supposed to
comment in the pull request saying they want it to be
applied to both branches? Or should they rather create to
separate pull requests for each branch (from 2 different
topic branches)?<br>
</blockquote>
I would say it depends on the case - no reason to make
things harder to do than necessary :)<br>
<br>
I would say a PR clearly marked as should going to both is
enough in many cases but while we are getting our feet wet
here doing one for each might be worth doing.<br>
</blockquote>
<br>
IMO it should be done in JIRA by assigning right fix versions:
4.0.0.CR1 - for master, 4.0.0.Beta2 for -
jbosstools-4.0.0.Beta2x branch.<br>
</blockquote>
<div><br>
</div>
<div>Yes, JIRA should always have the right fix versions set.
But that doesn't solve this problem. Or did you mean to say
that the repo maintainer should look at the JIRA to see which
branches he should apply the changes to? I don't think it's
safe – Max' suggestions seem better - either create two PRs or
create one and state the destination branches in the PR.</div>
</div>
</blockquote>
It's safe because repo maintainer should go to jira and use workflow
to mark jira as resolved. But it is fine do it through declaring
branches to apply in pull request description.<br>
<br>
Denis<br>
<blockquote
cite="mid:427450F5-023A-4AED-BC7B-9C1B5D772614@redhat.com"
type="cite">
<div>
<div><br>
</div>
<div>-Martin</div>
<br>
<blockquote type="cite">
<blockquote type="cite"><br>
<blockquote type="cite">Sorry if I'm asking something
obvious - these are new things to me :)<br>
</blockquote>
same here - we'll find a way; i'm collecting notes for all
"git whoops" I see happening to adjust recommendations as we
learn, so keep them coming:)<br>
<br>
/max<br>
_______________________________________________<br>
jbosstools-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:jbosstools-dev@lists.jboss.org">jbosstools-dev@lists.jboss.org</a><br>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/jbosstools-dev">https://lists.jboss.org/mailman/listinfo/jbosstools-dev</a><br>
</blockquote>
<br>
</blockquote>
</div>
<br>
<div apple-content-edited="true">
<span class="Apple-style-span" style="border-collapse: separate;
color: rgb(0, 0, 0); font-family: Helvetica; font-style:
normal; font-variant: normal; font-weight: normal;
letter-spacing: normal; line-height: normal; orphans: 2;
text-align: -webkit-auto; text-indent: 0px; text-transform:
none; white-space: normal; widows: 2; word-spacing: 0px;
-webkit-border-horizontal-spacing: 0px;
-webkit-border-vertical-spacing: 0px;
-webkit-text-decorations-in-effect: none;
-webkit-text-size-adjust: auto; -webkit-text-stroke-width:
0px; font-size: medium; "><span class="Apple-style-span"
style="border-collapse: separate; color: rgb(0, 0, 0);
font-family: Helvetica; font-style: normal; font-variant:
normal; font-weight: normal; letter-spacing: normal;
line-height: normal; orphans: 2; text-align: -webkit-auto;
text-indent: 0px; text-transform: none; white-space: normal;
widows: 2; word-spacing: 0px;
-webkit-border-horizontal-spacing: 0px;
-webkit-border-vertical-spacing: 0px;
-webkit-text-decorations-in-effect: none;
-webkit-text-size-adjust: auto; -webkit-text-stroke-width:
0px; font-size: medium; ">
<div style="word-wrap: break-word; -webkit-nbsp-mode: space;
-webkit-line-break: after-white-space; ">
<div apple-content-edited="true">
<div style="word-wrap: break-word; -webkit-nbsp-mode:
space; -webkit-line-break: after-white-space;
font-size: 12px; "><span class="Apple-style-span"
style="border-collapse: separate; color: rgb(0, 0,
0); font-family: Helvetica; font-size: 12px;
font-style: normal; font-variant: normal;
font-weight: normal; letter-spacing: normal;
line-height: normal; orphans: 2; text-indent: 0px;
text-transform: none; white-space: normal; widows:
2; word-spacing: 0px;
-webkit-border-horizontal-spacing: 0px;
-webkit-border-vertical-spacing: 0px;
-webkit-text-decorations-in-effect: none;
-webkit-text-size-adjust: auto;
-webkit-text-stroke-width: 0px; ">
<div style="word-wrap: break-word;
-webkit-nbsp-mode: space; -webkit-line-break:
after-white-space; ">
<div><br>
</div>
</div>
</span></div>
</div>
</div>
</span></span><br class="Apple-interchange-newline">
</div>
<br>
</blockquote>
<br>
</body>
</html>