[prev in list] [next in list] [prev in thread] [next in thread] 

List:       python-dev
Subject:    Re: [Python-Dev] cpython (merge 3.4 -> default): null merge with 3.4
From:       Senthil Kumaran <senthil () uthcode ! com>
Date:       2015-06-16 2:30:41
Message-ID: 11F58A5421434146A1E07F9C669FC828 () uthcode ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On Sunday, June 14, 2015 at 6:43 PM, Ned Deily wrote:
> Senthil,
> 
> There is now an active 3.5 branch, so the correct current order of 
> merging is:
> 
> 3.4 -> 3.5
> 3.5 -> default
> 
> I've checked in a couple of null merges to try to fix things.
Oh! Missed that. Sorry, for the trouble. 
I will update my local branches and follow the process.

3.4 -> 3.5
3.5 -> default

Thank you!
Senthil


[Attachment #5 (text/html)]

                <div><span style="color: rgb(160, 160, 168);">On Sunday, June 14, \
2015 at 6:43 PM, Ned Deily wrote:</span></div><blockquote type="cite"><div>  \
<span><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 13px; \
font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: \
normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; \
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; \
-webkit-text-stroke-width: 0px;">Senthil,</div><div style="color: rgb(0, 0, 0); \
font-family: Helvetica; font-size: 13px; font-style: normal; font-variant: normal; \
font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; \
text-align: start; text-indent: 0px; text-transform: none; white-space: normal; \
widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><br></div><div \
style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 13px; font-style: \
normal; font-variant: normal; font-weight: normal; letter-spacing: normal; \
line-height: normal; orphans: auto; text-align: start; text-indent: 0px; \
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; \
-webkit-text-stroke-width: 0px;">There is now an active 3.5 branch, so the correct \
current order of<span>&nbsp;</span></div><div style="color: rgb(0, 0, 0); \
font-family: Helvetica; font-size: 13px; font-style: normal; font-variant: normal; \
font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; \
text-align: start; text-indent: 0px; text-transform: none; white-space: normal; \
widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">merging \
is:</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 13px; \
font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: \
normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; \
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; \
-webkit-text-stroke-width: 0px;"><br></div><div style="color: rgb(0, 0, 0); \
font-family: Helvetica; font-size: 13px; font-style: normal; font-variant: normal; \
font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; \
text-align: start; text-indent: 0px; text-transform: none; white-space: normal; \
widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">3.4 -&gt; \
3.5</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 13px; \
font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: \
normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; \
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; \
-webkit-text-stroke-width: 0px;">3.5 -&gt; default</div><div style="color: rgb(0, 0, \
0); font-family: Helvetica; font-size: 13px; font-style: normal; font-variant: \
normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: \
auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; \
widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><br></div><div \
style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 13px; font-style: \
normal; font-variant: normal; font-weight: normal; letter-spacing: normal; \
line-height: normal; orphans: auto; text-align: start; text-indent: 0px; \
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; \
-webkit-text-stroke-width: 0px;">I've checked in a couple of null merges to try to \
fix things.</div></span></div></blockquote><div>Oh! Missed that. Sorry, for the \
trouble.&nbsp;</div><div>I will update my local branches and follow the \
process.</div><div><br></div><div>3.4 -&gt; 3.5</div><div>3.5 -&gt; \
default</div><div><br></div><div>Thank you!</div><div>Senthil</div><div><br></div>  



_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: https://mail.python.org/mailman/options/python-dev/python-dev-marcsub-zyf4%40marc.info


[prev in list] [next in list] [prev in thread] [next in thread]