[Scons-dev] Easy PR to merge

[Bill Deegan]

Merged.
Thanks!
-Bill

On Thu, Jul 23, 2015 at 11:33 AM, anatoly techtonik <techtonik at gmail.com>
wrote:

> Hi Bill,
>
> Try again, please.
>
> https://bitbucket.org/scons/scons/pull-request/239/fix-premature-syntaxerror-on-python-3/diff
>
> I am almost 100% sure I've updated request. Just in case if will be broken
> again,
> you can try to pull the change directly from my fork.
>
> hg inc -r 113ddcc
> <https://bitbucket.org/techtonik/scons/commits/113ddcc5132e12dcaa301f3753bad91ed365d315>
>  ssh://hg@bitbucket.org/techtonik/scons
>
>
> On Thu, Jul 23, 2015 at 4:09 PM, Bill Deegan <bill at baddogconsulting.com>
> wrote:
>
>> Anatoly,
>>
>> When I look at the bug it says "
>>
>> *Nothing to merge. The source or destination branch was deleted or these
>> changes already exist in the destination repository."*
>> The pull request shows no commits either..
>>
>> -Bill
>>
>> On Wed, Jul 22, 2015 at 2:57 AM, anatoly techtonik <techtonik at gmail.com>
>> wrote:
>>
>>>
>>> https://bitbucket.org/scons/scons/pull-request/239/fix-premature-syntaxerror-on-python-3/diff
>>>
>>> This fixes traceback on Python 3. Will help to unblock my patch queue.
>>> Thanks..
>>>
>>> --
>>> anatoly t.
>>>
>>> _______________________________________________
>>> Scons-dev mailing list
>>> Scons-dev at scons.org
>>> https://pairlist2.pair.net/mailman/listinfo/scons-dev
>>>
>>>
>>
>> _______________________________________________
>> Scons-dev mailing list
>> Scons-dev at scons.org
>> https://pairlist2.pair.net/mailman/listinfo/scons-dev
>>
>>
>
>
> --
> anatoly t.
>
> _______________________________________________
> Scons-dev mailing list
> Scons-dev at scons.org
> https://pairlist2.pair.net/mailman/listinfo/scons-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://pairlist2.pair.net/pipermail/scons-dev/attachments/20150724/7b2b19f7/attachment.html>