Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > comp.lang.python > #77645

Re: [OT?]cpython pull from hg

From Peter Otten <__peter__@web.de>
Subject Re: [OT?]cpython pull from hg
Date 2014-09-06 10:42 +0200
Organization None
References <lueems$q38$1@ger.gmane.org>
Newsgroups comp.lang.python
Message-ID <mailman.13827.1409992984.18130.python-list@python.org> (permalink)

Show all headers | View raw


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]
> 

Back to comp.lang.python | Previous | Next | Find similar | Unroll thread


Thread

Re: [OT?]cpython pull from hg Peter Otten <__peter__@web.de> - 2014-09-06 10:42 +0200

csiph-web