[Python-checkins] CANNOT Patch 3.x NEWS [was cpython (2.7): Issue #14707: add news entry\

[Terry Reedy]

Bottom line: I decided to restart from scratch. I am still not sure if 
the glitch was hg, disk 1, disk 2, or Windows, or some combination.

After making and posting a patch to the tracker today, I tried to 
annotate a file and got an error something like 'cannot find revision 
-1'. I then noticed that there was no dag in the workbench dag window, 
as if there were no revisions. When I looked in .hg/store, the big file 
seemed to be missing. So I wiped, defragmented and compacted, and 
reloaded TortoiseHg. Tomorrow I will re-clone and share the repository. 
Since this is the second time I have re-cloned from python.org, I will 
follow the advice I read somewhere to make a _backup clone that I leave 
alone until I need it, so I only have to pull from now until then when I do.

On 3/12/2013 7:34 PM, Ezio Melotti wrote:

> I wonder if TortoiseHg is doing something wrong here.  Maybe you could
> try from cmd too.

Workbench has a 'command' window for typing hg commands which it should 
pass as is to Windows much as Command Prompt does. I tried some of the 
things you suggested there.

> Around the time you pushed on 2.7 I also pushed something, so that
> might have created some conflict.

I do not remember seeing that.

> How does your .bat look like?

pull -u to cpython + update of each of the three shares, much like 
written in the devguide.

> That's possible.  From "hg help graft":
>      If a graft merge results in conflicts, the graft process is interrupted so
>      that the current merge can be manually resolved. Once all conflicts are
>      addressed, the graft process can be continued with the -c/--continue
>      option.

When merge produces a conflict, a window appears offering options 
including using kdiff3 to resolve. When I tried the graft, the message 
in the command window was just 'aborted', and I do not remember getting 
the resolve window.

> When I graft/merge and there are conflicts I use kdiff3, and it takes
> just a few seconds to solve the conflicts usually (for Misc/NEWS is
> ctrl+2, ctrl+3, ctrl+s, alt+f4, that roughly translates too "include
> both the conflicting news, save and quit).

Since I have perhaps never gotten that sequence right, that info will be 
helpful.

> If you do it from cmd/file manager hg should see it as missing ('!' in
> "hg status") and you can use "hg revert Misc/NEWS" to restore it.

This.

Thanks for trying to help. I will let you know if there are any more 
problems after the re-clone.

I still need to comment on the tcl/tk.dll and tkinter situation, but 
will just mention now that I ran the four test_txxxx files on 3.3a0 (on 
Windows) and they seemed to finish and be ok other than altering the 
environment.

Terry