Make 'update' warn about merge conflicts

diff --git a/config.h b/config.h
index 3c7fdf1dbcc3860665ad18dc14c3d5e40522a860..b13bf504bd991e5ee12f1400c2507871703ae5de 100644 (file)
--- a/config.h
+++ b/config.h
@@ -135,7 +135,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "146"
+#define VCS_REVISION "147"
 
 /* Version number of package */
 #define VERSION "2.9"

diff --git a/configure b/configure
index e732907c35bf0d13f6ce1b42a8e8d48dd21082ec..0eaf7df60c808618a0e03707892ae26e9bc0f5a4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=146
+VCS_REVISION=147
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 92e9470f22039fe976a8c0d716eddb1b4d3c822d..a39efc45a00c83f9f1be7074c1721b64210faf8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
-VCS_REVISION=146
+VCS_REVISION=147
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/demo/vt100.js b/demo/vt100.js
index f7a1e58098a54175a2e59a4f8152589d95c04dc9..452bc5d4a9d0ef12d796bca6eeebb59527a5fa2d 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 146)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 147)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/libhttp/httpconnection.c b/libhttp/httpconnection.c
index fc6efe76c9f48c8cb07ba5a2038a83cded661eab..a41c0c1c7b8ae11f64f38e6f607fc0facc2e8b13 100644 (file)
--- a/libhttp/httpconnection.c
+++ b/libhttp/httpconnection.c
@@ -595,7 +595,8 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
           free(msg);
           msg               = compressed;
           len              -= strm.avail_out;
-          snprintf(contentLength, 21, "%20d", len - (ptr - compressed));
+          snprintf(contentLength, 21, "%20lu",
+                   (unsigned long)(len - (ptr - compressed)));
           contentLength[20] = '\r';
         } else {
           free(compressed);

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index bb10ff83bdaafaff3f155ef63f4701575ebdc3b9..fa028b5677a5d03bd334eadd8c699d94b3fb808f 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.9 (revision 146)" +
+  alert("Shell In A Box version " + "2.9 (revision 147)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index f7a1e58098a54175a2e59a4f8152589d95c04dc9..452bc5d4a9d0ef12d796bca6eeebb59527a5fa2d 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 146)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 147)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/update b/update
index 9387618e4b35ecc736519e84d68efad1c37cc6f3..e03b877c2f3736e71451298919a1b26f9b85eef7 100755 (executable)
--- a/update
+++ b/update
@@ -29,6 +29,13 @@ rm -rf aclocal.m4 configure config.guess config.h config.h.in config.sub      \
        ltmain.sh m4 Makefile.in
 
 svn update
+[ -z "$(svn sv|grep '^C')" ] || {
+  echo "Some files could not be synchronized with the SVN repository." >&2
+  echo "You have to manually resolve the merge conflicts and rerun this "     \
+       "script" >&2
+  exit 1
+}
+
 aclocal
 libtoolize --force --copy
 autoreconf