##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984
Pulkit Goyal -
r39017:d49e490a @94 stable
Show More
Name Size Modified Last Commit Author
/ contrib / chg
Makefile Loading ...
README Loading ...
chg.1 Loading ...
chg.c Loading ...
hgclient.c Loading ...
hgclient.h Loading ...
procutil.c Loading ...
procutil.h Loading ...
util.c Loading ...
util.h Loading ...

cHg
===

A fast client for Mercurial command server running on Unix.

Install:

$ make
$ make install

Usage:

$ chg help # show help of Mercurial
$ alias hg=chg # replace hg command
$ chg --kill-chg-daemon # terminate background server

Environment variables:

Although cHg tries to update environment variables, some of them cannot be
changed after spawning the server. The following variables are specially
handled:

* configuration files are reloaded automatically by default.
* CHGHG or HG specifies the path to the hg executable spawned as the
background command server.

The following variables are available for testing:

* CHGDEBUG enables debug messages.
* CHGSOCKNAME specifies the socket path of the background cmdserver.
* CHGTIMEOUT specifies how many seconds chg will wait before giving up
connecting to a cmdserver. If it is 0, chg will wait forever. Default: 60