Mercurial > utils
changeset 573:d8030b06fd51
Update docs with new naming schema.
author | Oleksandr Gavenko <gavenkoa@gmail.com> |
---|---|
date | Thu, 08 May 2014 22:48:32 +0300 |
parents | 8a1afde74602 |
children | 15b39ce1378b |
files | hg/hgsyncee.1 hg/hgsyncew.1 hg/hgsyncrc.5 |
diffstat | 3 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hg/hgsyncee.1 Thu May 08 22:46:22 2014 +0300 +++ b/hg/hgsyncee.1 Thu May 08 22:48:32 2014 +0300 @@ -18,7 +18,7 @@ Just cd to dir with repos, run hgsyncew. May happen that you must go to merge dir (pointed by -.IR $HG_PULL_DIR/$proj ) +.IR $EXTERNAL_DIR/$proj ) to merge changes manually and rerun .BR hgsyncee . @@ -28,9 +28,9 @@ .BR hgsyncrc(5) . You can not use HTTP protocol in -.IR HG_PULL_DIR +.IR EXTERNAL_DIR and -.IR HG_PUSH_DIR +.IR MASTER_DIR for .BR hgsyncee . .SH OPTIONS
--- a/hg/hgsyncew.1 Thu May 08 22:46:22 2014 +0300 +++ b/hg/hgsyncew.1 Thu May 08 22:48:32 2014 +0300 @@ -17,11 +17,11 @@ To use .BR hgsyncew you must set -.IR HG_PUSH_DIR +.IR MASTER_DIR option in .BR hgsyncrc(5) . Only pull request was allowed to use remote protocol for -.IR HG_PUSH_DIR . +.IR MASTER_DIR . .SH OPTIONS .IP --help @@ -37,9 +37,9 @@ .fi Get changes from -.IR $HG_PUSH_DIR/proj1 +.IR $MASTER_DIR/proj1 and -.IR $HG_PUSH_DIR/proj2 +.IR $MASTER_DIR/proj2 to .IR proj1 and
--- a/hg/hgsyncrc.5 Thu May 08 22:46:22 2014 +0300 +++ b/hg/hgsyncrc.5 Thu May 08 22:48:32 2014 +0300 @@ -8,23 +8,23 @@ hgsyncrc \- configuration file for hgsync utilities \" .SH SYNOPSIS .SH DESCRIPTION -File contain two parameters HG_PUSH_DIR and HG_PULL_DIR. +File contain two parameters MASTER_DIR and EXTERNAL_DIR. \" .SH OPTIONS .SH EXAMPLES Example of hgsyncrc file .PP .EX # this is comment - HG_PUSH_DIR=/srv/hg-general-repo - HG_PULL_DIR=/home/user/devel/hg-pull-repo + MASTER_DIR=/srv/hg-general-repo + EXTERNAL_DIR=/home/user/devel/hg-pull-repo .EE .PP Under Windows (with MSYS or Cygwin installed) use config like: .PP .EX # this is comment - HG_PUSH_DIR=c:/srv/hg-push-repo - HG_PULL_DIR=c:/home/devel/hg-pull-repo + MASTER_DIR=c:/srv/hg-push-repo + EXTERNAL_DIR=c:/home/devel/hg-pull-repo .EE .PP .SH FILES