Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!eu.feeder.erje.net!newsfeed.xs4all.nl!newsfeed2a.news.xs4all.nl!xs4all!newsgate.cistron.nl!newsgate.news.xs4all.nl!post.news.xs4all.nl!not-for-mail
Return-Path: <python-python-list@m.gmane.org>
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; '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; 'changes': 0.15; 'files"': 0.16; 'manifests': 0.16; 'pulling': 0.16; 'received:80.91.229.3': 0.16; 'received:dip0.t-ipconnect.de': 0.16; 'received:plane.gmane.org': 0.16; 'received:t-ipconnect.de': 0.16; 'removed,': 0.16; 'sync': 0.16; 'wrote:': 0.18; 'header:User-Agent:1': 0.23; "i've": 0.25; 'header:X-Complaints-To:1': 0.27; "doesn't": 0.30; "i'm": 0.30; 'getting': 0.31; 'remotely': 0.31; 'sep': 0.31; 'file': 0.32; 'skip:m 30': 0.32; 'another': 0.32; 'says': 0.33; 'url:python': 0.33; 'guess': 0.33; 'sense': 0.34; 'skip:d 20': 0.34; "i'd": 0.34; 'subject:from': 0.34; 'knowledge': 0.35; 'skip:u 20': 0.35; 'but': 0.35; 'sat': 0.36; 'url:org': 0.36; 'searching': 0.37; 'to:addr:python-list': 0.38; 'files': 0.38; 'expect': 0.39; 'explain': 0.39; 'to:addr:python.org': 0.39; 'received:org': 0.40; 'completed': 0.61; 'cut': 0.74; 'updated,': 0.84; 'url:cpython': 0.84
X-Injected-Via-Gmane: http://gmane.org/
To: python-list@python.org
From: Peter Otten <__peter__@web.de>
Subject: Re: [OT?]cpython pull from hg
Date: Sat, 06 Sep 2014 10:42:50 +0200
Organization: None
References: <lueems$q38$1@ger.gmane.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7Bit
X-Gmane-NNTP-Posting-Host: p57bd8c29.dip0.t-ipconnect.de
User-Agent: KNode/4.13.3
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: General discussion list for the Python programming language <python-list.python.org>
List-Unsubscribe: <https://mail.python.org/mailman/options/python-list>, <mailto:python-list-request@python.org?subject=unsubscribe>
List-Archive: <http://mail.python.org/pipermail/python-list/>
List-Post: <mailto:python-list@python.org>
List-Help: <mailto:python-list-request@python.org?subject=help>
List-Subscribe: <https://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe>
Newsgroups: comp.lang.python
Message-ID: <mailman.13827.1409992984.18130.python-list@python.org>
Lines: 30
NNTP-Posting-Host: 2001:888:2000:d::a6
X-Trace: 1409992984 news.xs4all.nl 2957 [2001:888:2000:d::a6]:43083
X-Complaints-To: abuse@xs4all.nl
Xref: csiph.com comp.lang.python:77645

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.

> % hg pull --verbose --update --config ui.merge=internal:merge
> http://hg.python.org/cpython
> pulling from http://hg.python.org/cpython
> searching for changes
> all local heads known remotely
> adding changesets
> adding manifests
> adding file changes
> added 12 changesets with 26 changes to 22 files
> resolving manifests
> getting Doc/library/asyncio.rst
> getting Doc/reference/expressions.rst
> getting Mac/BuildScript/build-installer.py
> 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> [command completed successfully Sat Sep 06 08:34:18 2014]
>