Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!eternal-september.org!feeder.eternal-september.org!feeds.phibee-telecom.net!newsfeed.xs4all.nl!newsfeed3.news.xs4all.nl!xs4all!newsgate.cistron.nl!newsgate.news.xs4all.nl!post.news.xs4all.nl!not-for-mail Return-Path: X-Original-To: python-list@python.org Delivered-To: python-list@mail.python.org X-Spam-Status: OK 0.001 X-Spam-Evidence: '*H*': 1.00; '*S*': 0.00; 'subject:: [': 0.04; 'warnings': 0.04; 'output': 0.05; 'modified': 0.07; 'lawrence': 0.09; 'mercurial': 0.09; 'received:80.91': 0.09; 'received:80.91.229': 0.09; 'received:gmane.org': 0.09; 'received:list': 0.09; 'screen.': 0.09; 'jan': 0.12; 'changes': 0.15; 'deprecation': 0.16; 'files"': 0.16; 'received:80.91.229.3': 0.16; 'received:plane.gmane.org': 0.16; 'reedy': 0.16; 'removed,': 0.16; 'sync': 0.16; 'ignore': 0.16; 'wrote:': 0.18; 'all,': 0.19; 'version.': 0.19; 'separate': 0.22; 'tests': 0.22; 'header:User- Agent:1': 0.23; "i've": 0.25; 'header:X-Complaints-To:1': 0.27; 'header:In-Reply-To:1': 0.27; 'am,': 0.29; 'patch': 0.29; "doesn't": 0.30; "i'm": 0.30; 'regular': 0.32; 'run': 0.32; 'another': 0.32; 'says': 0.33; 'guess': 0.33; 'updated': 0.34; 'sense': 0.34; "i'd": 0.34; 'subject:from': 0.34; 'knowledge': 0.35; 'something': 0.35; 'test': 0.35; 'but': 0.35; 'there': 0.35; 'doing': 0.36; 'basis.': 0.38; 'to:addr:python-list': 0.38; 'files': 0.38; 'expect': 0.39; 'explain': 0.39; 'received:71': 0.39; 'to:addr:python.org': 0.39; 'changed': 0.39; 'received:org': 0.40; 'total': 0.65; 'default': 0.69; 'cut': 0.74; 'unusual': 0.74; '2.7.': 0.84; 'otten': 0.84; 'received:fios.verizon.net': 0.84; 'updated,': 0.84 X-Injected-Via-Gmane: http://gmane.org/ To: python-list@python.org From: Terry Reedy Subject: Re: [OT?]cpython pull from hg Date: Sat, 06 Sep 2014 06:06:11 -0400 References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Gmane-NNTP-Posting-Host: pool-71-175-90-87.phlapa.fios.verizon.net User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 In-Reply-To: X-BeenThere: python-list@python.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: General discussion list for the Python programming language List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Newsgroups: comp.lang.python Message-ID: Lines: 26 NNTP-Posting-Host: 2001:888:2000:d::a6 X-Trace: 1409998002 news.xs4all.nl 2874 [2001:888:2000:d::a6]:54214 X-Complaints-To: abuse@xs4all.nl Xref: csiph.com comp.lang.python:77646 On 9/6/2014 4:42 AM, Peter Otten wrote: > Mark Lawrence wrote: > >> The following doesn't make any sense to me as I've very limited >> knowledge of Mercurial so can someone explain why it says "added 12 >> changesets with 26 changes to 22 files" but then "3 files updated, 0 >> files merged, 0 files removed, 0 files unresolved". I'd expect to see >> 22 files updated. The output is cut and pasted directly from the >> TortoiseHg Sync screen. > > I'm no expert either, but I would guess that the other modified files exist > only in another branch. The other files mostly, perhaps all, exist in default but were only modified for 2.7. I just pulled and updated my separate working directories for 2.7, 3.4, and 3.5. In particular, 32 files changed for 2.7, 4 for 3.4, and 8 for 3.5, 37 files total changed in some version. This is a very unusual distribution. I know that there was one patch that modified about 10 test files to ignore valid py3 warnings when the tests are run with py3 deprecation warnings turned on. This is something we just got around to doing on a regular basis. -- Terry Jan Reedy