Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/editmergeps.bat
author Augie Fackler <augie@google.com>
Mon, 26 Feb 2018 00:50:35 -0500
changeset 36460 efebfa9b4cab
parent 32600 4b9b87930cb3
permissions -rw-r--r--
httppeer: explicitly catch urlerr.httperror and re-raise On Python 3 it seems urllib.error.HTTPError doesn't set the .args field of the exception to have any contents, which then breaks our socket.error catch. This works around that issue. Differential Revision: https://phab.mercurial-scm.org/D2448
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32368
799615bbf5bf contrib: add editmerge version for powershell
Kostia Balytskyi <ikostia@fb.com>
parents:
diff changeset 
     1
 
@echo off
32600
4b9b87930cb3 contrib: run editmergeps.ps1 from the same location as editmergeps.bat
Kostia Balytskyi <ikostia@fb.com>
parents: 32368
diff changeset 
     2
 
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"
hg-stable