Mercurial > hg > easyhg
diff mainwindow.cpp @ 137:a4044b4b3e35
* Include closed branches in heads check (see comment)
author | Chris Cannam |
---|---|
date | Tue, 30 Nov 2010 13:51:27 +0000 |
parents | aaeab914f2a3 |
children | e6c6b88d19b9 |
line wrap: on
line diff
--- a/mainwindow.cpp Tue Nov 30 13:50:58 2010 +0000 +++ b/mainwindow.cpp Tue Nov 30 13:51:27 2010 +0000 @@ -178,8 +178,12 @@ void MainWindow::hgQueryHeads() { QStringList params; - params << "heads"; - // on empty repos, "hg heads" will fail -- we don't care about that. + // On empty repos, "hg heads" will fail -- we don't care about + // that. Use --closed option so as to include closed branches; + // otherwise we'll be stuck if the user updates into one, and our + // incremental log will end up with spurious stuff in it because + // we won't be pruning at the ends of closed branches + params << "heads" << "--closed"; runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params)); }