[Monotone-commits-diffs] net.venge.monotone: 65bcb8cf8b32f68a5b48629b328f6d65979e58df

[code]

revision:            65bcb8cf8b32f68a5b48629b328f6d65979e58df
date:                2011-04-16T15:35:40
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '161767762762ac96c5fe8c8f88f7588a68540d87'
     and 'bb5b0702260383c4086ab2088bfa79883f53f6ce'

manifest:
format_version "1"

new_manifest [4674a4f9a62b4513faeab3a275c96a4af1606a91]

old_revision [161767762762ac96c5fe8c8f88f7588a68540d87]

patch "extra/shell/monotone.bash_completion.in"
 from [df7a7d5b8f27d5dfdf4bd09f953f0b4e26518775]
   to [b9f93761b9d2bebfdcf1d82f5147211b10bb51de]

old_revision [bb5b0702260383c4086ab2088bfa79883f53f6ce]

patch ".mtn-ignore"
 from [347361ce3fa47016cbe4f5ba29188696d939a1d8]
   to [bd2b1b11006b28d0b1fb079e6b9c77521c704508]

patch "HACKING"
 from [cf403ac1b4e542270a8f08bdeb0ae0dd61d9d0aa]
   to [db78c6f7b4dd870840f6bcbc906d8faa2e737daa]

patch "configure.ac"
 from [23cd7505238b2a23f75befa7d99893dd869b9363]
   to [195c8b95513b0490fe09ab6d6d44902aceda9b53]

patch "test/func/db_opt_fallback_mechanisms/__driver__.lua"
 from [09354a970b921effa2850aa4ad722ce95a433ea8]
   to [0b0da944f19f7a0be42165069fdc1bb8862fd6ee]
============================================================
--- extra/shell/monotone.bash_completion.in	df7a7d5b8f27d5dfdf4bd09f953f0b4e26518775
+++ extra/shell/monotone.bash_completion.in	b9f93761b9d2bebfdcf1d82f5147211b10bb51de
@@ -70,6 +70,7 @@ _monotone_databases() {
 
 _monotone_databases() {
     _filedir mtn
+    _filedir db
     COMPREPLY=(
 	"address@hidden"
 	$(compgen -W "$(LANG=POSIX \
============================================================
--- configure.ac	23cd7505238b2a23f75befa7d99893dd869b9363
+++ configure.ac	195c8b95513b0490fe09ab6d6d44902aceda9b53
@@ -10,7 +10,7 @@ AC_PREREQ(2.58)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
-AC_INIT([monotone], [1.1dev], [https://code.monotone.ca/p/monotone/issues/], ,
+AC_INIT([monotone], [1.0.90], [https://code.monotone.ca/p/monotone/issues/], ,
 	[http://www.monotone.ca])
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 no-dist-gzip std-options])
 AC_CONFIG_SRCDIR([src/app_state.cc])
============================================================
--- HACKING	cf403ac1b4e542270a8f08bdeb0ae0dd61d9d0aa
+++ HACKING	db78c6f7b4dd870840f6bcbc906d8faa2e737daa
@@ -25,7 +25,7 @@ The appropriate Emacs modeline to use fo
 
 -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 
-And something close (but not perfect) for VIM:
+And something close (but not perfect) for VIM (requires "set cindent"):
 
 vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
 
============================================================
--- .mtn-ignore	347361ce3fa47016cbe4f5ba29188696d939a1d8
+++ .mtn-ignore	bd2b1b11006b28d0b1fb079e6b9c77521c704508
@@ -62,7 +62,7 @@
 ^src/std_hooks\.cc$
 ^stamp-h1$
 ^stamp-vti$
-^test/(func|tester|unit)\.status$
+^test/(extra|func|tester|unit)\.status$
 ^test/bin$
 ^test/src/testlib\.cc$
 ^test/unit/tests/[^._]*(_+[^._]+)+$
============================================================
--- test/func/db_opt_fallback_mechanisms/__driver__.lua	09354a970b921effa2850aa4ad722ce95a433ea8
+++ test/func/db_opt_fallback_mechanisms/__driver__.lua	0b0da944f19f7a0be42165069fdc1bb8862fd6ee
@@ -14,4 +14,4 @@ check(raw_mtn("au", "remote", "interface
 -- and some commands should use :memory: as default because they
 -- just need a temporary throw-away database to work properly
 check(raw_mtn("au", "remote", "interface_version", "--remote-stdio-host", "http://code.monotone.ca/monotone", "--key="), 0, false, true)
-check(qgrep("No database given; assuming ':memory:' database", "stderr"))
+check(qgrep("no database given; assuming ':memory:' database", "stderr"))