Mercurial > public > mercurial-scm > hg-stable
view mercurial/mergeutil.py @ 53035:6e1eb7212633 stable
nightly-build: attempt to no longer choke on existing file
When we run the job multiple time, the upload step fails because the file always
exists. So we pass the `--skip-existing` flag that is supposed to help with
that? when supported.
This might have no effect outside of upload to PyPI as the doc says:
Continue uploading files if one already exists. (Only valid when uploading
to PyPI. Other implementations may not support this.)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 10 Mar 2025 14:28:33 +0100 |
| parents | f4733654f144 |
| children |
line wrap: on
line source
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import annotations from .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )