[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: 0adcfd6aa61edc7ce8caf1a80a
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: 0adcfd6aa61edc7ce8caf1a80a4daff172dc9bde |
Date: |
Mon, 17 Jan 2011 01:34:34 GMT |
revision: 0adcfd6aa61edc7ce8caf1a80a4daff172dc9bde
date: 2011-01-17T01:34:09
author: Timothy Brownawell <address@hidden>
branch: net.venge.monotone
changelog:
Don't die if a workspace's old database doesn't exist / can't be opened.
Hm, this would probably have made the netsync_permissions_wildcards
test pass as well without having to reorder it.
manifest:
format_version "1"
new_manifest [39124771c1a59837e4dc8f4cabca187e141a7cbc]
old_revision [8fd19a59e4cbf8dd7c12ab37f1a59daedea227df]
patch "work.cc"
from [3c717e59b3acf99ee9cdb49ff688cad9e11472f3]
to [48211daca37c626fea2eea19870d225b35eabaf5]
============================================================
--- work.cc 3c717e59b3acf99ee9cdb49ff688cad9e11472f3
+++ work.cc 48211daca37c626fea2eea19870d225b35eabaf5
@@ -659,8 +659,16 @@ workspace::set_options(options const & o
if (cur_opts.dbname_given)
{
- database old_db(cur_opts, lua);
- old_db.unregister_workspace(current_workspace);
+ try
+ {
+ database old_db(cur_opts, lua);
+ old_db.unregister_workspace(current_workspace);
+ }
+ catch (recoverable_failure & rf)
+ {
+ W(F("could not unregiser workspace from old database %s")
+ % old_db_path);
+ }
}
database new_db(opts, lua);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: 0adcfd6aa61edc7ce8caf1a80a4daff172dc9bde,
code <=