[Python-Dev] Committing a bug fix

[Terry Reedy]

On 9/27/2015 10:05 PM, Alexander Belopolsky wrote:
>
>
> On Sun, Sep 27, 2015 at 9:12 PM, R. David Murray <rdmurray at bitdance.com
> <mailto:rdmurray at bitdance.com>> wrote:
>
>     ..
>
>     3.4, 3.5, and default.

3.4.4rc1 is due out next Sunday.  Only emergency patches after that.

> Thanks.  Maybe you can help me to make hg cooperate.  I made commits to
>   3.4, 3.5, and default and tried to push, but hg complains:

See the python-checking list, which you should be reading.
You neglected to forward merge a 3.4-3.4 merge and a 3.5-3.5 merge.  I 
failed to notice the first and added a commit, and then backed it out, 
when I could not merge forward due to merge conflicts with your commits. 
  Perhaps you just need to null-merge the 3.4 commits into 3.5, but I do 
not really know how to make the repository usable again.

> remote has heads on branch '3.4' that are not known locally: 46aaff5e8945
> remote has heads on branch '3.5' that are not known locally: 0d3b64bbc82c
> remote has heads on branch 'default' that are not known locally:
> 48943533965e
> abort: push creates new remote head ff68705c56a8 on branch '3.4'!
>
>


-- 
Terry Jan Reedy