# HG changeset patch # User Chris Cannam # Date 1299968288 0 # Node ID bf4bbb53e21702ccf7d812d486c003d31d7bce06 # Parent ef977e7482cd9e339ee25c82e1a857dd457d9ca0 Fix incorrect report following failed push (was falling through to merge-failed case) diff -r ef977e7482cd -r bf4bbb53e217 mainwindow.cpp --- a/mainwindow.cpp Fri Mar 11 18:08:35 2011 +0000 +++ b/mainwindow.cpp Sat Mar 12 22:18:08 2011 +0000 @@ -1818,7 +1818,7 @@ // if clone fails, we have no repo m_workFolderPath = ""; enableDisableActions(); - break; + break; // go on to default report case ACT_INCOMING: // returns non-zero code and no output if the check was // successful but there are no changes pending @@ -1826,7 +1826,7 @@ showIncoming(""); return; } - break; + break; // go on to default report case ACT_QUERY_HEADS: // fails if repo is empty; we don't care (if there's a genuine // problem, something else will fail too). Pretend it @@ -1845,6 +1845,7 @@ reportNewRemoteHeads(output); return; } + break; // go on to default report case ACT_MERGE: case ACT_RETRY_MERGE: MoreInformationDialog::information @@ -1853,7 +1854,7 @@ output); return; case ACT_STAT: - break; // go on and report + break; // go on to default report default: break; }