165166167168169170171172173174175
} resolver.serializeChanged(transaction); transaction.commit(); } catch (HgRuntimeException ex) { transaction.rollback(); mergeStateBuilder.abandon(); throw ex; } catch (HgIOException ex) { transaction.rollback(); mergeStateBuilder.abandon(); throw ex;
169170171172173174175176177178179
transaction.rollback(); mergeStateBuilder.abandon(); throw ex; } catch (HgIOException ex) { transaction.rollback(); mergeStateBuilder.abandon(); throw ex; } } catch (HgRuntimeException ex) { throw new HgLibraryFailureException(ex); } finally {