[Monotone-commits-diffs] Revision 2b06ad562d9a82ed5e89d79be133de99662b5f78

[monotone]

-----------------------------------------------------------------
Revision: 2b06ad562d9a82ed5e89d79be133de99662b5f78
Ancestor: 1d18cd61b5f68105acd9af5e734bb04b9f096e3a
Author: address@hidden
Date: 2007-03-06T06:56:33
Branch: net.venge.monotone.guitone

Modified files:
        guitone/res/forms/commit_revision.ui guitone/src/Guitone.cpp
        guitone/src/model/GetRevision.cpp
        guitone/src/model/GetRevision.h
        guitone/src/monotone/Monotone.cpp
        guitone/src/monotone/Monotone.h
        guitone/src/monotone/MonotoneDelegate.cpp
        guitone/src/view/MainWindow.cpp
        guitone/src/view/MainWindow.h
        guitone/src/view/dialogs/CommitRevision.cpp
        guitone/src/view/dialogs/CommitRevision.h

ChangeLog: 

* GetRevision, CommitRevision: support for (workspace) merge revisions
* MainWindow, Guitone: remove criticalMtnError slot
* Monotone: remove criticalError signal, rewrite error handling a bit, now
  we wait some time after we started a new mtn process and check if errors
  come up; still needs a better window management afterwards, but at least
  it does not crash anymore after loading an invalid database

txtdLlIz1D4VV.txt
Description: Diff [1d18cd61b5f68105acd9af5e734bb04b9f096e3a] -> [2b06ad562d9a82ed5e89d79be133de99662b5f78]