# # # patch "contrib/usher.cc" # from [cbf841677dc4ce5be196e3a439a211eaf779a46d] # to [96ebe95bde3ae2d7e40c9c659a854177c3500c7f] # # patch "monotone.1" # from [e555ecf47d53884594f8fd6c5ea0fb12afc5a1c8] # to [9d6e28ed91576baedfc295f6a51eb6de75527aa5] # # patch "monotone.cc" # from [510ce2ee55b92a5b09c8fe086be42967573517c8] # to [8b65d26abe840735e4ac7939ceaa299af5899b61] # # patch "po/fr.po" # from [1cc9083443a50ae73f039d17ceb547eaad04b9f0] # to [443c06ade7f988e456243963d978769a53fd76cc] # # patch "po/ja.po" # from [0b4599ee497a230e6d90a6e4bc48b2f1d09b219a] # to [636a1ccfd6ffff4fc79244bbffb117ed3eea7d52] # # patch "po/pt_BR.po" # from [31cb1cb94d65eb644f94c786bdbbaba516651f28] # to [080e73cb4023790b6d88405bb7870950e795e9d9] # # patch "testsuite.at" # from [44169e5abbfba7f70877c5b1f26bab8ba0e9a8dd] # to [afa17034ba2ed9acd7de7f475197e42476362f29] # ============================================================ --- contrib/usher.cc cbf841677dc4ce5be196e3a439a211eaf779a46d +++ contrib/usher.cc 96ebe95bde3ae2d7e40c9c659a854177c3500c7f @@ -15,7 +15,7 @@ // Usage: usher [-l address[:port]] [-a address:port] [-p pidfile] // // options: -// -l address and port to listen on, defaults to 0.0.0.0:5253 +// -l address and port to listen on, defaults to 0.0.0.0:4691 // -a address and port to listen for admin commands // -p a file (deleted on program exit) to record the pid of the usher in // a file that looks like @@ -24,7 +24,7 @@ // server monotone // host localhost // pattern net.venge.monotone -// remote 66.96.28.3:5253 +// remote 66.96.28.3:4691 // // server local // host 127.0.0.1 @@ -882,7 +882,7 @@ srv->port = lexical_cast(desc.substr(c+1)); } else { srv->addr = desc; - srv->port = 5253; + srv->port = 4691; } } return name; ============================================================ --- monotone.1 e555ecf47d53884594f8fd6c5ea0fb12afc5a1c8 +++ monotone.1 9d6e28ed91576baedfc295f6a51eb6de75527aa5 @@ -170,7 +170,7 @@ .TP \fBserve\fP \fI[--pid-file=] [: \fP Serve contents of \fI\fP at network address \fI\fP, on the -port \fI\fP. If \fI\fP isn't given, 5253 is used. If a +port \fI\fP. If \fI\fP isn't given, 4691 is used. If a --pid-file option is provided on the command line, monotone will store the process id of the server in the specified file. .TP ============================================================ --- monotone.cc 510ce2ee55b92a5b09c8fe086be42967573517c8 +++ monotone.cc 8b65d26abe840735e4ac7939ceaa299af5899b61 @@ -68,7 +68,7 @@ {"diff-args", 0, POPT_ARG_STRING, &argstr, OPT_EXTERNAL_DIFF_ARGS, gettext_noop("argument to pass external diff hook"), NULL}, {"lca", 0, POPT_ARG_NONE, NULL, OPT_LCA, gettext_noop("use least common ancestor as ancestor for merge"), NULL}, {"execute", 'e', POPT_ARG_NONE, NULL, OPT_EXECUTE, gettext_noop("perform the associated file operation"), NULL}, - {"bind", 0, POPT_ARG_STRING, &argstr, OPT_BIND, gettext_noop("address:port to listen on (default :5253)"), NULL}, + {"bind", 0, POPT_ARG_STRING, &argstr, OPT_BIND, gettext_noop("address:port to listen on (default :4691)"), NULL}, {"missing", 0, POPT_ARG_NONE, NULL, OPT_MISSING, gettext_noop("perform the operations for files missing from working directory"), NULL}, {"unknown", 0, POPT_ARG_NONE, NULL, OPT_UNKNOWN, gettext_noop("perform the operations for unknown files from working directory"), NULL}, {"key-to-push", 0, POPT_ARG_STRING, &argstr, OPT_KEY_TO_PUSH, gettext_noop("push the specified key even if it hasn't signed anything"), NULL}, ============================================================ --- po/fr.po 1cc9083443a50ae73f039d17ceb547eaad04b9f0 +++ po/fr.po 443c06ade7f988e456243963d978769a53fd76cc @@ -735,8 +735,8 @@ msgstr "" #: ../monotone.cc:71 -msgid "address:port to listen on (default :5253)" -msgstr "écouteur sur adresse:port (défaut :5233)" +msgid "address:port to listen on (default :4691)" +msgstr "écouteur sur adresse:port (défaut :4691)" #: ../monotone.cc:72 msgid "perform the operations for files missing from working directory" ============================================================ --- po/ja.po 0b4599ee497a230e6d90a6e4bc48b2f1d09b219a +++ po/ja.po 636a1ccfd6ffff4fc79244bbffb117ed3eea7d52 @@ -3018,7 +3018,7 @@ msgstr "関連付けられたファイル操作を実行" #: monotone.cc:71 -msgid "address:port to listen on (default :5253)" +msgid "address:port to listen on (default :4691)" msgstr "" #: monotone.cc:72 ============================================================ --- po/pt_BR.po 31cb1cb94d65eb644f94c786bdbbaba516651f28 +++ po/pt_BR.po 080e73cb4023790b6d88405bb7870950e795e9d9 @@ -2836,7 +2836,7 @@ msgstr "" #: monotone.cc:71 -msgid "address:port to listen on (default :5253)" +msgid "address:port to listen on (default :4691)" msgstr "" #: monotone.cc:72 ============================================================ --- testsuite.at 44169e5abbfba7f70877c5b1f26bab8ba0e9a8dd +++ testsuite.at afa17034ba2ed9acd7de7f475197e42476362f29 @@ -447,7 +447,7 @@ # run as LARGISH_FILE_CREATE(filename, size) to create a MB file of # uncompressible data m4_define([LARGISH_FILE_CREATE], [ -awk -- 'BEGIN{srand(5253);for(a=0;a<1024*1024;a+=20)printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256);}' > largish.tmp +awk -- 'BEGIN{srand(4691);for(a=0;a<1024*1024;a+=20)printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256,rand()*256);}' > largish.tmp i=$2 while test $i -gt 0; do cat largish.tmp >> $1