tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 28 Mar 2006 09:01:07 -0800
changeset 2016 ff5c9a92f556
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
fix backtrace printed when cannot get lock. change lock error handling code so exceptions have useful info and exception handling in one place. add test case for when cannot get lock.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)